mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
ASoC: rt712-sdca-sdw: fix locking sequence
[ Upstream commitc8b2e5c1b9
] The disable_irq_lock protects the 'disable_irq' value, we need to lock before testing it. Fixes:7a8735c155
("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> Link: https://msgid.link/r/20240325221817.206465-5-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
3bfbc530a6
commit
1064108334
1 changed files with 3 additions and 2 deletions
|
@ -438,13 +438,14 @@ static int __maybe_unused rt712_sdca_dev_resume(struct device *dev)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!slave->unattach_request) {
|
if (!slave->unattach_request) {
|
||||||
if (rt712->disable_irq == true) {
|
|
||||||
mutex_lock(&rt712->disable_irq_lock);
|
mutex_lock(&rt712->disable_irq_lock);
|
||||||
|
if (rt712->disable_irq == true) {
|
||||||
|
|
||||||
sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK1, SDW_SCP_SDCA_INTMASK_SDCA_0);
|
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);
|
sdw_write_no_pm(slave, SDW_SCP_SDCA_INTMASK2, SDW_SCP_SDCA_INTMASK_SDCA_8);
|
||||||
rt712->disable_irq = false;
|
rt712->disable_irq = false;
|
||||||
mutex_unlock(&rt712->disable_irq_lock);
|
|
||||||
}
|
}
|
||||||
|
mutex_unlock(&rt712->disable_irq_lock);
|
||||||
goto regmap_sync;
|
goto regmap_sync;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue