From: Richard Fitzgerald Date: Mon, 31 Jul 2023 16:57:20 +0000 (+0100) Subject: ALSA: hda/cs35l56: Call cs_dsp_power_down() before reloading firmware X-Git-Tag: v6.6.17~3959^2~15^2~79 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=15c378d66fc5bd00ce7c8ac869624f9a4a29d1d4;p=platform%2Fkernel%2Flinux-rpi.git ALSA: hda/cs35l56: Call cs_dsp_power_down() before reloading firmware When firmware is reloaded after a system resume cs_dsp_power_down() should be called before calling cs_dsp_power_up(). The fw_patched flag should also be cleared and only set again if the firmware download succeeded. Signed-off-by: Richard Fitzgerald Link: https://lore.kernel.org/r/20230731165726.7940-4-rf@opensource.cirrus.com Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c index fda716e0db09..b6b8cb21da75 100644 --- a/sound/pci/hda/cs35l56_hda.c +++ b/sound/pci/hda/cs35l56_hda.c @@ -527,6 +527,12 @@ static int cs35l56_hda_fw_load(struct cs35l56_hda *cs35l56) char *wmfw_filename = NULL; int ret = 0; + /* Prepare for a new DSP power-up */ + if (cs35l56->base.fw_patched) + cs_dsp_power_down(&cs35l56->cs_dsp); + + cs35l56->base.fw_patched = false; + cs35l56_hda_request_firmware_files(cs35l56, &wmfw_firmware, &wmfw_filename, &coeff_firmware, &coeff_filename);