diff options
| author | Mark Brown <broonie@kernel.org> | 2021-02-17 18:52:25 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-02-17 18:52:25 +0000 |
| commit | 3b9b1490e098f4847a215d2be6a66fbb891bfc7a (patch) | |
| tree | aacd0777b9c0bb1ffa1e560bd3b0ab4bdb45211c /sound/soc/sof/intel/hda-dsp.c | |
| parent | 92bf22614b21a2706f4993b278017e437f7785b3 (diff) | |
| parent | bd8036eb15263a720b8f846861c180b27d050a09 (diff) | |
| download | linux-stable-3b9b1490e098f4847a215d2be6a66fbb891bfc7a.tar.gz linux-stable-3b9b1490e098f4847a215d2be6a66fbb891bfc7a.tar.bz2 linux-stable-3b9b1490e098f4847a215d2be6a66fbb891bfc7a.zip | |
Merge remote-tracking branch 'asoc/for-5.11' into asoc-linus
Diffstat (limited to 'sound/soc/sof/intel/hda-dsp.c')
| -rw-r--r-- | sound/soc/sof/intel/hda-dsp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c index 1c5e05b88a90..1799fc56a3e4 100644 --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -802,11 +802,15 @@ int hda_dsp_runtime_idle(struct snd_sof_dev *sdev) int hda_dsp_runtime_suspend(struct snd_sof_dev *sdev) { + struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata; const struct sof_dsp_power_state target_state = { .state = SOF_DSP_PM_D3, }; int ret; + /* cancel any attempt for DSP D0I3 */ + cancel_delayed_work_sync(&hda->d0i3_work); + /* stop hda controller and power dsp off */ ret = hda_suspend(sdev, true); if (ret < 0) |