projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6ba5041
)
ASoC: intel: bytcr_rt5651: add null check to support_button_press
author
Jaska Uimonen
<jaska.uimonen@intel.com>
Fri, 27 Sep 2019 20:14:05 +0000
(15:14 -0500)
committer
Mark Brown
<broonie@kernel.org>
Tue, 1 Oct 2019 17:33:02 +0000
(18:33 +0100)
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>
sound/soc/codecs/rt5651.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/rt5651.c
b/sound/soc/codecs/rt5651.c
index
762595d
..
c506c93
100644
(file)
--- 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;