From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Derek Fang <derek.fang@realtek.com>,
Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>,
oder_chiou@realtek.com, lgirdwood@gmail.com, perex@perex.cz,
tiwai@suse.com, alsa-devel@alsa-project.org
Subject: [PATCH AUTOSEL 5.15 09/26] ASoC: rt5682: fix the wrong jack type detected
Date: Mon, 27 Dec 2021 14:03:10 -0500 [thread overview]
Message-ID: <20211227190327.1042326-9-sashal@kernel.org> (raw)
In-Reply-To: <20211227190327.1042326-1-sashal@kernel.org>
From: Derek Fang <derek.fang@realtek.com>
[ Upstream commit 8deb34a90f06374fd26f722c2a79e15160f66be7 ]
Some powers were changed during the jack insert detection
and clk's enable/disable in CCF.
If in parallel, the influence has a chance to detect
the wrong jack type, so add a lock.
Signed-off-by: Derek Fang <derek.fang@realtek.com>
Link: https://lore.kernel.org/r/20211214105033.471-1-derek.fang@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
sound/soc/codecs/rt5682.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
index 5ac2b1444694d..757d1362b5f48 100644
--- a/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c
@@ -927,6 +927,8 @@ int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert)
unsigned int val, count;
if (jack_insert) {
+ snd_soc_dapm_mutex_lock(dapm);
+
snd_soc_component_update_bits(component, RT5682_PWR_ANLG_1,
RT5682_PWR_VREF2 | RT5682_PWR_MB,
RT5682_PWR_VREF2 | RT5682_PWR_MB);
@@ -973,6 +975,8 @@ int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert)
snd_soc_component_update_bits(component, RT5682_MICBIAS_2,
RT5682_PWR_CLK25M_MASK | RT5682_PWR_CLK1M_MASK,
RT5682_PWR_CLK25M_PU | RT5682_PWR_CLK1M_PU);
+
+ snd_soc_dapm_mutex_unlock(dapm);
} else {
rt5682_enable_push_button_irq(component, false);
snd_soc_component_update_bits(component, RT5682_CBJ_CTRL_1,
--
2.34.1
next prev parent reply other threads:[~2021-12-27 19:04 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-27 19:03 [PATCH AUTOSEL 5.15 01/26] pinctrl: mediatek: fix global-out-of-bounds issue Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 02/26] Input: i8042 - add deferred probe support Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 03/26] Input: iqs626a - prohibit inlining of channel parsing functions Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 04/26] ASoC: SOF: Intel: pci-tgl: add ADL-N support Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 05/26] ASoC: SOF: Intel: pci-tgl: add new ADL-P variant Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 06/26] Input: i8042 - enable deferred probe quirk for ASUS UM325UA Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 07/26] Input: goodix - add id->model mapping for the "9111" model Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 08/26] hwmon: (lm90) Do not report 'busy' status bit as alarm Sasha Levin
2021-12-27 19:03 ` Sasha Levin [this message]
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 10/26] ASoC: tas2770: Fix setting of high sample rates Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 11/26] Revert "x86/boot: Pull up cmdline preparation and early param parsing" Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 12/26] tomoyo: Check exceeded quota early in tomoyo_domain_quota_is_ok() Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 13/26] tomoyo: use hwight16() " Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 14/26] x86/boot: Move EFI range reservation after cmdline parsing Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 15/26] net/sched: Extend qdisc control block with tc control block Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 16/26] tun: avoid double free in tun_free_netdev Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 17/26] ax25: NPD bug when detaching AX25 device Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 18/26] Input: elants_i2c - do not check Remark ID on eKTH3900/eKTH5312 Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 19/26] phonet/pep: refuse to enable an unbound pipe Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 20/26] parisc: Clear stale IIR value on instruction access rights trap Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 21/26] platform/mellanox: mlxbf-pmc: Fix an IS_ERR() vs NULL bug in mlxbf_pmc_map_counters Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 22/26] platform/x86: apple-gmux: use resource_size() with res Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 23/26] memblock: fix memblock_phys_alloc() section mismatch error Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 24/26] ALSA: hda: intel-sdw-acpi: harden detection of controller Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 25/26] ALSA: hda: intel-sdw-acpi: go through HDAS ACPI at max depth of 2 Sasha Levin
2021-12-27 19:03 ` [PATCH AUTOSEL 5.15 26/26] r8152: sync ocp base Sasha Levin
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=20211227190327.1042326-9-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=derek.fang@realtek.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=oder_chiou@realtek.com \
--cc=perex@perex.cz \
--cc=stable@vger.kernel.org \
--cc=tiwai@suse.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®