mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] ASoC: wm8962: Fix broken headset button caused by wrong guard constant
@ 2026-11-17  7:05 Chen Yuxi
  2026-11-17 10:07 ` Charles Keepax
  2026-11-17 13:57 ` Sebastian Krzyszkowiak
  0 siblings, 2 replies; 3+ messages in thread
From: Chen Yuxi @ 2026-11-17  7:05 UTC (permalink / raw)
  To: broonie, lgirdwood
  Cc: ckeepax, patches, sebastian.krzyszkowiak, linux-sound,
	linux-kernel, chenyuxi19, yeweihua4, pulehui

Commit e59075211902 ("ASoC: wm8962: Don't report a microphone if
it's shorted to ground on plug") guards the mic short report by
testing wm8962->mic_status against WM8962_MICDET_STS.  But mic_status
stores the reported jack status, composed of SND_JACK_MICROPHONE and
SND_JACK_BTN_0, which never has WM8962_MICDET_STS set.  The guard is
therefore always true, so every mic short event reports nothing.

Pressing the button on a TRRS headset shorts the mic pin to ground,
which used to be reported as SND_JACK_BTN_0.  After that commit the
button press is silently dropped, breaking the headset button on all
wm8962 boards using the mic detect path.

Test mic_status against SND_JACK_MICROPHONE instead, restoring the
intended behaviour: suppress the report only when no microphone was
previously detected, i.e. a TRS plug in a TRRS socket.

Fixes: e59075211902 ("ASoC: wm8962: Don't report a microphone if it's shorted to ground on plug")
Cc: stable@vger.kernel.org
Signed-off-by: Chen Yuxi <chenyuxi19@huawei.com>
---
 sound/soc/codecs/wm8962.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 148480e4124f..a4868685218b 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3127,7 +3127,7 @@ static void wm8962_mic_work(struct work_struct *work)
 		/* Don't report a microphone if it's shorted right after
 		 * plugging in, as this may be a TRS plug in a TRRS socket.
 		 */
-		if (!(wm8962->mic_status & WM8962_MICDET_STS))
+		if (!(wm8962->mic_status & SND_JACK_MICROPHONE))
 			status = 0;
 	}
 
-- 
2.34.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ASoC: wm8962: Fix broken headset button caused by wrong guard constant
  2026-11-17  7:05 [PATCH] ASoC: wm8962: Fix broken headset button caused by wrong guard constant Chen Yuxi
@ 2026-11-17 10:07 ` Charles Keepax
  2026-11-17 13:57 ` Sebastian Krzyszkowiak
  1 sibling, 0 replies; 3+ messages in thread
From: Charles Keepax @ 2026-11-17 10:07 UTC (permalink / raw)
  To: Chen Yuxi
  Cc: broonie, lgirdwood, patches, sebastian.krzyszkowiak, linux-sound,
	linux-kernel, yeweihua4, pulehui

On Tue, Nov 17, 2026 at 07:05:16AM +0000, Chen Yuxi wrote:
> Commit e59075211902 ("ASoC: wm8962: Don't report a microphone if
> it's shorted to ground on plug") guards the mic short report by
> testing wm8962->mic_status against WM8962_MICDET_STS.  But mic_status
> stores the reported jack status, composed of SND_JACK_MICROPHONE and
> SND_JACK_BTN_0, which never has WM8962_MICDET_STS set.  The guard is
> therefore always true, so every mic short event reports nothing.
> 
> Pressing the button on a TRRS headset shorts the mic pin to ground,
> which used to be reported as SND_JACK_BTN_0.  After that commit the
> button press is silently dropped, breaking the headset button on all
> wm8962 boards using the mic detect path.
> 
> Test mic_status against SND_JACK_MICROPHONE instead, restoring the
> intended behaviour: suppress the report only when no microphone was
> previously detected, i.e. a TRS plug in a TRRS socket.
> 
> Fixes: e59075211902 ("ASoC: wm8962: Don't report a microphone if it's shorted to ground on plug")
> Cc: stable@vger.kernel.org
> Signed-off-by: Chen Yuxi <chenyuxi19@huawei.com>
> ---

Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ASoC: wm8962: Fix broken headset button caused by wrong guard constant
  2026-11-17  7:05 [PATCH] ASoC: wm8962: Fix broken headset button caused by wrong guard constant Chen Yuxi
  2026-11-17 10:07 ` Charles Keepax
@ 2026-11-17 13:57 ` Sebastian Krzyszkowiak
  1 sibling, 0 replies; 3+ messages in thread
From: Sebastian Krzyszkowiak @ 2026-11-17 13:57 UTC (permalink / raw)
  To: broonie, lgirdwood, Chen Yuxi
  Cc: ckeepax, patches, linux-sound, linux-kernel, chenyuxi19,
	yeweihua4, pulehui

On wtorek, 17 listopada 2026 08:05:16 czas środkowoeuropejski standardowy Chen 
Yuxi wrote:
> Commit e59075211902 ("ASoC: wm8962: Don't report a microphone if
> it's shorted to ground on plug") guards the mic short report by
> testing wm8962->mic_status against WM8962_MICDET_STS.  But mic_status
> stores the reported jack status, composed of SND_JACK_MICROPHONE and
> SND_JACK_BTN_0, which never has WM8962_MICDET_STS set.  The guard is
> therefore always true, so every mic short event reports nothing.
> 
> Pressing the button on a TRRS headset shorts the mic pin to ground,
> which used to be reported as SND_JACK_BTN_0.  After that commit the
> button press is silently dropped, breaking the headset button on all
> wm8962 boards using the mic detect path.
> 
> Test mic_status against SND_JACK_MICROPHONE instead, restoring the
> intended behaviour: suppress the report only when no microphone was
> previously detected, i.e. a TRS plug in a TRRS socket.
> 
> Fixes: e59075211902 ("ASoC: wm8962: Don't report a microphone if it's
> shorted to ground on plug") Cc: stable@vger.kernel.org
> Signed-off-by: Chen Yuxi <chenyuxi19@huawei.com>
> ---
>  sound/soc/codecs/wm8962.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
> index 148480e4124f..a4868685218b 100644
> --- a/sound/soc/codecs/wm8962.c
> +++ b/sound/soc/codecs/wm8962.c
> @@ -3127,7 +3127,7 @@ static void wm8962_mic_work(struct work_struct *work)
>  		/* Don't report a microphone if it's shorted right 
after
>  		 * plugging in, as this may be a TRS plug in a TRRS 
socket.
>  		 */
> -		if (!(wm8962->mic_status & WM8962_MICDET_STS))
> +		if (!(wm8962->mic_status & SND_JACK_MICROPHONE))
>  			status = 0;
>  	}

Reviewed-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>




^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2026-11-17 13:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-17  7:05 [PATCH] ASoC: wm8962: Fix broken headset button caused by wrong guard constant Chen Yuxi
2026-11-17 10:07 ` Charles Keepax
2026-11-17 13:57 ` Sebastian Krzyszkowiak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®