releases/6.6.26/asoc-rt722-sdca-sdw-fix-locking-sequence.patch

   1 From 9203eaf81f462bfdd22e77a24ccd8c353f07f6fa Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Mon, 25 Mar 2024 17:18:16 -0500
   4 Subject: ASoC: rt722-sdca-sdw: fix locking sequence
   5
   6 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
   7
   8 [ Upstream commit adb354bbc231b23d3a05163ce35c1d598512ff64 ]
   9
  10 The disable_irq_lock protects the 'disable_irq' value, we need to lock
  11 before testing it.
  12
  13 Fixes: a0b7c59ac1a9 ("ASoC: rt722-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-6-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/rt722-sdca-sdw.c | 4 ++--
  22  1 file changed, 2 insertions(+), 2 deletions(-)
  23
  24 diff --git a/sound/soc/codecs/rt722-sdca-sdw.c b/sound/soc/codecs/rt722-sdca-sdw.c
  25 index a38ec58622145..43a4e79e56966 100644
  26 --- a/sound/soc/codecs/rt722-sdca-sdw.c
  27 +++ b/sound/soc/codecs/rt722-sdca-sdw.c
  28 @@ -464,13 +464,13 @@ static int __maybe_unused rt722_sdca_dev_resume(struct device *dev)
  29                 return 0;
  30
  31         if (!slave->unattach_request) {
  32 +               mutex_lock(&rt722->disable_irq_lock);
  33                 if (rt722->disable_irq == true) {
  34 -                       mutex_lock(&rt722->disable_irq_lock);
  35                         sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK1, SDW_SCP_SDCA_INTMASK_SDCA_6);
  36                         sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK2, SDW_SCP_SDCA_INTMASK_SDCA_8);
  37                         rt722->disable_irq = false;
  38 -                       mutex_unlock(&rt722->disable_irq_lock);
  39                 }
  40 +               mutex_unlock(&rt722->disable_irq_lock);
  41                 goto regmap_sync;
  42         }
  43
  44 --
  45 2.43.0
  46