diff mbox series

[1/4] ASoC: intel: bytcr_rt5651: add null check to support_button_press

Message ID 20190927201408.925-2-pierre-louis.bossart@linux.intel.com (mailing list archive)
State Accepted
Commit 2bdf194e2030fce4f2e91300817338353414ab3b
Headers show
Series ASoC: Intel: boards: improvements for RT5651/82-based platforms | expand

Commit Message

Pierre-Louis Bossart Sept. 27, 2019, 8:14 p.m. UTC 
From: Jaska Uimonen <jaska.uimonen@intel.com>

When removing sof module the support_button_press function will oops
because hp_jack pointer is not checked for NULL. So add a check to fix
this.

Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/codecs/rt5651.c | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index 762595de956c..c506c9305043 100644
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -1770,6 +1770,9 @@  static int rt5651_detect_headset(struct snd_soc_component *component)
 
 static bool rt5651_support_button_press(struct rt5651_priv *rt5651)
 {
+	if (!rt5651->hp_jack)
+		return false;
+
 	/* Button press support only works with internal jack-detection */
 	return (rt5651->hp_jack->status & SND_JACK_MICROPHONE) &&
 		rt5651->gpiod_hp_det == NULL;