Skip to contentSkip to conversation

ASoC: rt5645: del btn_check_timer on remove

PATCH In review Hans de Goede 2 participants 2 messages Jun 28, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: rt5645: del btn_check_timer on remove

The timer may still be running when rt5645_i2c_remove() gets called, call del_timer_sync() to make sure it is stopped.

---
 sound/soc/codecs/rt5645.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/codecs/rt5645.c +1 -0
index d8e7487482c2..e6a3ad17437c 100644
@@ -3915,6 +3915,7 @@ static int rt5645_i2c_remove(struct i2c_client *i2c)
 
 	cancel_delayed_work_sync(&rt5645->jack_detect_work);
 	cancel_delayed_work_sync(&rt5645->rcclock_work);
+	del_timer_sync(&rt5645->btn_check_timer);
 
 	snd_soc_unregister_codec(&i2c->dev);
 	regulator_bulk_disable(ARRAY_SIZE(rt5645->supplies), rt5645->supplies);
Signature · 1 line
2.13.0
maintainer
#1 lore raw

Applied "ASoC: rt5645: del btn_check_timer on remove" to the asoc tree

The patch

ASoC: rt5645: del btn_check_timer on remove

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

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

Quoted 1 line

From a6ff8ddcf3f38ec84337e5e7eb3e0e9a73754cf5 Mon Sep 17 00:00:00 2001

From: Hans de Goede <[email protected]>
Date: Wed, 28 Jun 2017 15:01:24 +0200
Subject: [PATCH] ASoC: rt5645: del btn_check_timer on remove

The timer may still be running when rt5645_i2c_remove() gets called, call del_timer_sync() to make sure it is stopped.

---
 sound/soc/codecs/rt5645.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/codecs/rt5645.c +1 -0
index 87844a45886a..206b41688d96 100644
@@ -3897,6 +3897,7 @@ static int rt5645_i2c_remove(struct i2c_client *i2c)
 
 	cancel_delayed_work_sync(&rt5645->jack_detect_work);
 	cancel_delayed_work_sync(&rt5645->rcclock_work);
+	del_timer_sync(&rt5645->btn_check_timer);
 
 	snd_soc_unregister_codec(&i2c->dev);
 	regulator_bulk_disable(ARRAY_SIZE(rt5645->supplies), rt5645->supplies);
Signature · 1 line
2.13.2