From: Chen Yuxi <chenyuxi19@huawei.com>
To: <broonie@kernel.org>, <lgirdwood@gmail.com>
Cc: <ckeepax@opensource.cirrus.com>, <patches@opensource.cirrus.com>,
<sebastian.krzyszkowiak@puri.sm>, <linux-sound@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <chenyuxi19@huawei.com>,
<yeweihua4@huawei.com>, <pulehui@huawei.com>
Subject: [PATCH] ASoC: wm8962: Fix broken headset button caused by wrong guard constant
Date: Tue, 17 Nov 2026 07:05:16 +0000 [thread overview]
Message-ID: <20261117070516.3861828-1-chenyuxi19@huawei.com> (raw)
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
next reply other threads:[~2026-11-17 7:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 7:05 Chen Yuxi [this message]
2026-11-17 10:07 ` Charles Keepax
2026-11-17 13:57 ` Sebastian Krzyszkowiak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117070516.3861828-1-chenyuxi19@huawei.com \
--to=chenyuxi19@huawei.com \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=pulehui@huawei.com \
--cc=sebastian.krzyszkowiak@puri.sm \
--cc=yeweihua4@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®