Skip to content

Commit adb354b

Browse files
plbossartbroonie
authored andcommitted
ASoC: rt722-sdca-sdw: fix locking sequence
The disable_irq_lock protects the 'disable_irq' value, we need to lock before testing it. Fixes: a0b7c59 ("ASoC: rt722-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> Link: https://msgid.link/r/20240325221817.206465-6-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent c8b2e5c commit adb354b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

sound/soc/codecs/rt722-sdca-sdw.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,13 +467,13 @@ static int __maybe_unused rt722_sdca_dev_resume(struct device *dev)
467467
return 0;
468468

469469
if (!slave->unattach_request) {
470+
mutex_lock(&rt722->disable_irq_lock);
470471
if (rt722->disable_irq == true) {
471-
mutex_lock(&rt722->disable_irq_lock);
472472
sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK1, SDW_SCP_SDCA_INTMASK_SDCA_6);
473473
sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK2, SDW_SCP_SDCA_INTMASK_SDCA_8);
474474
rt722->disable_irq = false;
475-
mutex_unlock(&rt722->disable_irq_lock);
476475
}
476+
mutex_unlock(&rt722->disable_irq_lock);
477477
goto regmap_sync;
478478
}
479479

0 commit comments

Comments
 (0)