diff options
author | Mark Brown <broonie@kernel.org> | 2023-05-30 22:41:29 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2023-05-30 22:41:29 +0300 |
commit | b48aa6a3577cccd13ea21392540f6cde437dd04d (patch) | |
tree | 77091078bd9c3fd7c38efea83ec71a0719676819 /sound/soc/codecs/cs35l56.c | |
parent | f2d4aa7e97eb60f426b92b95da712a6b3c18dc9a (diff) | |
parent | 60413129ee2b38a80347489270af7f6e1c1de4d0 (diff) | |
download | linux-b48aa6a3577cccd13ea21392540f6cde437dd04d.tar.xz |
ES8316 audio codec fixes on Rock5B
Merge series from Cristian Ciocaltea <cristian.ciocaltea@collabora.com>:
This patch series handles a few issues related to the ES8316 audio
codec, discovered while doing some testing on the Rock 5B board.
Diffstat (limited to 'sound/soc/codecs/cs35l56.c')
-rw-r--r-- | sound/soc/codecs/cs35l56.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c index 5df8cb556772..3c07bd1e959e 100644 --- a/sound/soc/codecs/cs35l56.c +++ b/sound/soc/codecs/cs35l56.c @@ -850,10 +850,11 @@ static void cs35l56_patch(struct cs35l56_private *cs35l56) */ if (cs35l56->sdw_peripheral) { cs35l56->sdw_irq_no_unmask = true; - cancel_work_sync(&cs35l56->sdw_irq_work); + flush_work(&cs35l56->sdw_irq_work); sdw_write_no_pm(cs35l56->sdw_peripheral, CS35L56_SDW_GEN_INT_MASK_1, 0); sdw_read_no_pm(cs35l56->sdw_peripheral, CS35L56_SDW_GEN_INT_STAT_1); sdw_write_no_pm(cs35l56->sdw_peripheral, CS35L56_SDW_GEN_INT_STAT_1, 0xFF); + flush_work(&cs35l56->sdw_irq_work); } ret = cs35l56_mbox_send(cs35l56, CS35L56_MBOX_CMD_SHUTDOWN); |