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:
b3df80a
)
ASoC: rt5682: Report the button event in the headset type only
author
Oder Chiou
<oder_chiou@realtek.com>
Thu, 16 Jul 2020 03:01:23 +0000
(11:01 +0800)
committer
Mark Brown
<broonie@kernel.org>
Thu, 16 Jul 2020 19:29:09 +0000
(20:29 +0100)
The irq work will be manipulated by resume function, and it will report
the wrong jack type while the jack type is headphone in the button event.
Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Link:
https://lore.kernel.org/r/20200716030123.27122-1-oder_chiou@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5682.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/rt5682.c
b/sound/soc/codecs/rt5682.c
index 5adfaf3a713453aead69b1ad1f8c68ebacab7474..d503b5bef4ba9ba62dc33c48a2660c6d2d652593 100644
(file)
--- a/
sound/soc/codecs/rt5682.c
+++ b/
sound/soc/codecs/rt5682.c
@@
-1082,7
+1082,8
@@
void rt5682_jack_detect_handler(struct work_struct *work)
/* jack was out, report jack type */
rt5682->jack_type =
rt5682_headset_detect(rt5682->component, 1);
- } else {
+ } else if ((rt5682->jack_type & SND_JACK_HEADSET) ==
+ SND_JACK_HEADSET) {
/* jack is already in, report button event */
rt5682->jack_type = SND_JACK_HEADSET;
btn_type = rt5682_button_detect(rt5682->component);