From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: linux-sound@vger.kernel.org
Cc: alsa-devel@alsa-project.org, tiwai@suse.de, broonie@kernel.org,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Chao Song <chao.song@linux.intel.com>
Subject: [PATCH 4/6] ASoC: rt712-sdca-sdw: fix locking sequence
Date: Mon, 25 Mar 2024 17:18:15 -0500 [thread overview]
Message-ID: <20240325221817.206465-5-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20240325221817.206465-1-pierre-louis.bossart@linux.intel.com>
The disable_irq_lock protects the 'disable_irq' value, we need to lock
before testing it.
Fixes: 7a8735c1551e ("ASoC: rt712-sdca: fix for JD event handling in ClockStop Mode0")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Chao Song <chao.song@linux.intel.com>
---
sound/soc/codecs/rt712-sdca-sdw.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/rt712-sdca-sdw.c b/sound/soc/codecs/rt712-sdca-sdw.c
index 01ac555cd79b..36d0dd532b8d 100644
--- a/sound/soc/codecs/rt712-sdca-sdw.c
+++ b/sound/soc/codecs/rt712-sdca-sdw.c
@@ -438,13 +438,14 @@ static int __maybe_unused rt712_sdca_dev_resume(struct device *dev)
return 0;
if (!slave->unattach_request) {
+ mutex_lock(&rt712->disable_irq_lock);
if (rt712->disable_irq == true) {
- mutex_lock(&rt712->disable_irq_lock);
+
sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK1, SDW_SCP_SDCA_INTMASK_SDCA_0);
sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK2, SDW_SCP_SDCA_INTMASK_SDCA_8);
rt712->disable_irq = false;
- mutex_unlock(&rt712->disable_irq_lock);
}
+ mutex_unlock(&rt712->disable_irq_lock);
goto regmap_sync;
}
--
2.40.1
next prev parent reply other threads:[~2024-03-25 22:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 22:18 [PATCH 0/6] ASoC: rt-sdw: fix locking and improve error logs Pierre-Louis Bossart
2024-03-25 22:18 ` [PATCH 1/6] ASoC: rt5682-sdw: fix locking sequence Pierre-Louis Bossart
2024-03-25 22:18 ` [PATCH 2/6] ASoC: rt711-sdca: " Pierre-Louis Bossart
2024-03-25 22:18 ` [PATCH 3/6] ASoC: rt711-sdw: " Pierre-Louis Bossart
2024-03-25 22:18 ` Pierre-Louis Bossart [this message]
2024-03-25 22:18 ` [PATCH 5/6] ASoC: rt722-sdca-sdw: " Pierre-Louis Bossart
2024-03-25 22:18 ` [PATCH 6/6] ASoC: rt-sdw*: add __func__ to all error logs Pierre-Louis Bossart
2024-03-25 22:49 ` [PATCH 0/6] ASoC: rt-sdw: fix locking and improve " Mark Brown
2024-03-29 12:34 ` Mark Brown
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=20240325221817.206465-5-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=chao.song@linux.intel.com \
--cc=linux-sound@vger.kernel.org \
--cc=tiwai@suse.de \
--cc=yung-chuan.liao@linux.intel.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