diff options
| author | Jaska Uimonen <jaska.uimonen@intel.com> | 2019-09-27 22:14:05 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-10-01 19:33:02 +0200 |
| commit | 2bdf194e2030fce4f2e91300817338353414ab3b (patch) | |
| tree | 0686e6a9f92d94a08170fdfa61206150ed702d3e | |
| parent | ASoC: intel: sof_rt5682: add remove function to disable jack (diff) | |
| download | linux-2bdf194e2030fce4f2e91300817338353414ab3b.tar.xz linux-2bdf194e2030fce4f2e91300817338353414ab3b.zip | |
ASoC: intel: bytcr_rt5651: add null check to support_button_press
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>
Link: https://lore.kernel.org/r/20190927201408.925-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/rt5651.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |