| Message ID | 20200716030123.27122-1-oder_chiou@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fe0a53044b4bce947045eadd7fa1adbc4685afab |
| Headers | show |
| Series | ASoC: rt5682: Report the button event in the headset type only | expand |
On Thu, 16 Jul 2020 11:01:23 +0800, Oder Chiou wrote: > 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. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: rt5682: Report the button event in the headset type only commit: fe0a53044b4bce947045eadd7fa1adbc4685afab All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index b634e582ef7e..d7302f968a75 100644 --- 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);
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> --- sound/soc/codecs/rt5682.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)