diff options
| author | Mark Brown <broonie@kernel.org> | 2022-06-22 12:14:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-06-22 12:14:20 +0100 |
| commit | 644ed467c773ae7649cb54c9709aabc6f2984850 (patch) | |
| tree | 5c4b6670569b70852ed940b590e0e83d32d7c031 /sound/soc/sof/intel/hda-loader.c | |
| parent | 6b183919f7051294dc5fc331bb608d5d7f29f5da (diff) | |
| parent | f69a10f84cb5ff0b1c6aef0e19e866bbe53ec7ea (diff) | |
ASoC: Merge fixes
Needed for new development.
Diffstat (limited to 'sound/soc/sof/intel/hda-loader.c')
| -rw-r--r-- | sound/soc/sof/intel/hda-loader.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c index bca9dc5917f4..819b3b08c655 100644 --- a/sound/soc/sof/intel/hda-loader.c +++ b/sound/soc/sof/intel/hda-loader.c @@ -395,7 +395,8 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) struct snd_dma_buffer dmab; int ret, ret1, i; - if (hda->imrboot_supported && !sdev->first_boot) { + if (sdev->system_suspend_target < SOF_SUSPEND_S4 && + hda->imrboot_supported && !sdev->first_boot) { dev_dbg(sdev->dev, "IMR restore supported, booting from IMR directly\n"); hda->boot_iteration = 0; ret = hda_dsp_boot_imr(sdev); |