Applied "ASoC: rt5651: Fix workqueue cancel vs irq free race on remove" to the asoc tree

Message ID E1fcxBm-0001jO-QL@debutante
State Accepted
Commit 8d2d7bcdc1645dc243f7735278675b083c0e506c
Headers show
  • Applied "ASoC: rt5651: Fix workqueue cancel vs irq free race on remove" to the asoc tree
Related show

Commit Message

Mark Brown July 10, 2018, 6:16 p.m.
The patch

   ASoC: rt5651: Fix workqueue cancel vs irq free race on remove

has been applied to the asoc tree at 

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.


From 8d2d7bcdc1645dc243f7735278675b083c0e506c Mon Sep 17 00:00:00 2001
From: Hans de Goede <>

Date: Thu, 5 Jul 2018 00:59:31 +0200
Subject: [PATCH] ASoC: rt5651: Fix workqueue cancel vs irq free race on remove

On removal we must free the IRQ *before* cancelling the jack-detect work,
so that the jack-detect work cannot be rescheduled by the IRQ.

Before this commit we were cancelling the jack-detect work from the
driver remove callback, while relying on devm to free the IRQ, which
happens after the remove callback.

This is the wrong order. This commit uses a devm-action to register
a devm callback which cancels the work, before requesting the IRQ
(devm tears things down in reverse order). This also allows us to
remove the now empty remove driver callback.

Cc: Carlo Caione <>
Signed-off-by: Hans de Goede <>

Signed-off-by: Mark Brown <>

 sound/soc/codecs/rt5651.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)


Alsa-devel mailing list


diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index 6b5669f3e85d..39d2c67cd064 100644
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -1696,6 +1696,13 @@  static irqreturn_t rt5651_irq(int irq, void *data)
 	return IRQ_HANDLED;
+static void rt5651_cancel_work(void *data)
+	struct rt5651_priv *rt5651 = data;
+	cancel_work_sync(&rt5651->jack_detect_work);
 static int rt5651_set_jack(struct snd_soc_component *component,
 			   struct snd_soc_jack *hp_jack, void *data)
@@ -2036,6 +2043,11 @@  static int rt5651_i2c_probe(struct i2c_client *i2c,
 	INIT_WORK(&rt5651->jack_detect_work, rt5651_jack_detect_work);
+	/* Make sure work is stopped on probe-error / remove */
+	ret = devm_add_action_or_reset(&i2c->dev, rt5651_cancel_work, rt5651);
+	if (ret)
+		return ret;
 	ret = devm_snd_soc_register_component(&i2c->dev,
 				rt5651_dai, ARRAY_SIZE(rt5651_dai));
@@ -2043,15 +2055,6 @@  static int rt5651_i2c_probe(struct i2c_client *i2c,
 	return ret;
-static int rt5651_i2c_remove(struct i2c_client *i2c)
-	struct rt5651_priv *rt5651 = i2c_get_clientdata(i2c);
-	cancel_work_sync(&rt5651->jack_detect_work);
-	return 0;
 static struct i2c_driver rt5651_i2c_driver = {
 	.driver = {
 		.name = "rt5651",
@@ -2059,7 +2062,6 @@  static struct i2c_driver rt5651_i2c_driver = {
 		.of_match_table = of_match_ptr(rt5651_of_match),
 	.probe = rt5651_i2c_probe,
-	.remove   = rt5651_i2c_remove,
 	.id_table = rt5651_i2c_id,