diff options
| author |   Hans de Goede <hdegoede@redhat.com> | 2017-06-28 15:01:24 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-06-28 18:34:46 +0100 |
| commit | a6ff8ddcf3f38ec84337e5e7eb3e0e9a73754cf5 (patch) | |
| tree | 713b160dd23b06c9a3d6799a4404649f34c233b8 /sound | |
| parent | Linux 4.12-rc1 (diff) | |
| download | linux-dev-a6ff8ddcf3f38ec84337e5e7eb3e0e9a73754cf5.tar.xz linux-dev-a6ff8ddcf3f38ec84337e5e7eb3e0e9a73754cf5.zip | |
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.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5645.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 87844a45886a..206b41688d96 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -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); |