summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorDmitry Osipenko <digetx@gmail.com>2020-01-06 02:47:07 +0100
committerMark Brown <broonie@kernel.org>2020-01-06 21:44:25 +0100
commit89b71b3f02d8ae5a08a1dd6f4a2098b7b868d498 (patch)
treea4e6e345b4245e10dfeb4291c08fd94ec12fe8f6 /sound/soc/codecs
parentASoC: Intel: boards: Fix compile-testing RT1011/RT5682 (diff)
downloadlinux-89b71b3f02d8ae5a08a1dd6f4a2098b7b868d498.tar.xz
linux-89b71b3f02d8ae5a08a1dd6f4a2098b7b868d498.zip
ASoC: rt5640: Fix NULL dereference on module unload
The rt5640->jack is NULL if jack is already disabled at the time of driver's module unloading. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Link: https://lore.kernel.org/r/20200106014707.11378-1-digetx@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/rt5640.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index adbae1f36a8a..747ca248bf10 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -2432,6 +2432,13 @@ static void rt5640_disable_jack_detect(struct snd_soc_component *component)
{
struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);
+ /*
+ * soc_remove_component() force-disables jack and thus rt5640->jack
+ * could be NULL at the time of driver's module unloading.
+ */
+ if (!rt5640->jack)
+ return;
+
disable_irq(rt5640->irq);
rt5640_cancel_work(rt5640);