diff mbox series

[1/2] ASoC: rt5682: Disable irq on shutdown

Message ID 20210508075151.1626903-1-swboyd@chromium.org (mailing list archive)
State Accepted
Commit 47bcb1c7108363418cd578283333d72e310dfeaa
Headers show
Series [1/2] ASoC: rt5682: Disable irq on shutdown | expand

Commit Message

Stephen Boyd May 8, 2021, 7:51 a.m. UTC
We cancel the work queues, and reset the device on shutdown, but the irq
isn't disabled so the work queues could be queued again. Let's disable
the irq during shutdown so that we don't have to worry about this device
trying to do anything anymore. This fixes a problem seen where the i2c
bus is shutdown at reboot but this device irq still comes in and tries
to make another i2c transaction when the bus doesn't work.

Cc: Jairaj Arava <jairaj.arava@intel.com>
Cc: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@intel.com>
Cc: Shuming Fan <shumingf@realtek.com>
Cc: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Fixes: 45a2702ce109 ("ASoC: rt5682: Fix panic in rt5682_jack_detect_handler happening during system shutdown")
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
 sound/soc/codecs/rt5682-i2c.c | 1 +
 1 file changed, 1 insertion(+)


base-commit: 9f4ad9e425a1d3b6a34617b8ea226d56a119a717

Comments

Mark Brown May 11, 2021, 8:25 a.m. UTC | #1
On Sat, 8 May 2021 00:51:50 -0700, Stephen Boyd wrote:
> We cancel the work queues, and reset the device on shutdown, but the irq
> isn't disabled so the work queues could be queued again. Let's disable
> the irq during shutdown so that we don't have to worry about this device
> trying to do anything anymore. This fixes a problem seen where the i2c
> bus is shutdown at reboot but this device irq still comes in and tries
> to make another i2c transaction when the bus doesn't work.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: rt5682: Disable irq on shutdown
      commit: 47bcb1c7108363418cd578283333d72e310dfeaa
[2/2] ASoC: rt5682: Implement remove callback
      commit: 87b42abae99d3d851aec64cd4d0f7def8113950e

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/codecs/rt5682-i2c.c b/sound/soc/codecs/rt5682-i2c.c
index 93c1603b42f1..8265b537ff4f 100644
--- a/sound/soc/codecs/rt5682-i2c.c
+++ b/sound/soc/codecs/rt5682-i2c.c
@@ -273,6 +273,7 @@  static void rt5682_i2c_shutdown(struct i2c_client *client)
 {
 	struct rt5682_priv *rt5682 = i2c_get_clientdata(client);
 
+	disable_irq(client->irq);
 	cancel_delayed_work_sync(&rt5682->jack_detect_work);
 	cancel_delayed_work_sync(&rt5682->jd_check_work);