queue-6.1/asoc-rt711-sdca-fix-locking-sequence.patch

   1 From ab96e8abb1c6e3f145a76d57b0f0a2f46985fefc Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Mon, 25 Mar 2024 17:18:13 -0500
   4 Subject: ASoC: rt711-sdca: fix locking sequence
   5
   6 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
   7
   8 [ Upstream commit ee287771644394d071e6a331951ee8079b64f9a7 ]
   9
  10 The disable_irq_lock protects the 'disable_irq' value, we need to lock
  11 before testing it.
  12
  13 Fixes: 23adeb7056ac ("ASoC: rt711-sdca: fix for JD event handling in ClockStop Mode0")
  14 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
  15 Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
  16 Reviewed-by: Chao Song <chao.song@linux.intel.com>
  17 Link: https://msgid.link/r/20240325221817.206465-3-pierre-louis.bossart@linux.intel.com
  18 Signed-off-by: Mark Brown <broonie@kernel.org>
  19 Signed-off-by: Sasha Levin <sashal@kernel.org>
  20 ---
  21  sound/soc/codecs/rt711-sdca-sdw.c | 4 ++--
  22  1 file changed, 2 insertions(+), 2 deletions(-)
  23
  24 diff --git a/sound/soc/codecs/rt711-sdca-sdw.c b/sound/soc/codecs/rt711-sdca-sdw.c
  25 index 487d3010ddc19..931dbc68548ee 100644
  26 --- a/sound/soc/codecs/rt711-sdca-sdw.c
  27 +++ b/sound/soc/codecs/rt711-sdca-sdw.c
  28 @@ -443,13 +443,13 @@ static int __maybe_unused rt711_sdca_dev_resume(struct device *dev)
  29                 return 0;
  30
  31         if (!slave->unattach_request) {
  32 +               mutex_lock(&rt711->disable_irq_lock);
  33                 if (rt711->disable_irq == true) {
  34 -                       mutex_lock(&rt711->disable_irq_lock);
  35                         sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK1, SDW_SCP_SDCA_INTMASK_SDCA_0);
  36                         sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK2, SDW_SCP_SDCA_INTMASK_SDCA_8);
  37                         rt711->disable_irq = false;
  38 -                       mutex_unlock(&rt711->disable_irq_lock);
  39                 }
  40 +               mutex_unlock(&rt711->disable_irq_lock);
  41                 goto regmap_sync;
  42         }
  43
  44 --
  45 2.43.0
  46