diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-02-05 12:33:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-02-05 12:33:45 +0100 |
| commit | 9db028827315550ea7e65898eebaf15d2456d830 (patch) | |
| tree | 4ba3067537cfd0d809fcac0396b2dab986c9930b /sound/soc/sof/pm.c | |
| parent | c7e661a1c2ae98a4754db6a85fc686b4a89322ad (diff) | |
| parent | 42b716359beca10684195fd6e93a74ecd8ca8003 (diff) | |
Merge tag 'asoc-v5.6-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.6
A collection of updates for bugs fixed since the initial pull
request, the most important one being the addition of COMMON_CLK
for wcd934x which is needed for MFD to be merged.
Diffstat (limited to 'sound/soc/sof/pm.c')
| -rw-r--r-- | sound/soc/sof/pm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c index 84290bbeebdd..a0cde053b61a 100644 --- a/sound/soc/sof/pm.c +++ b/sound/soc/sof/pm.c @@ -56,6 +56,10 @@ static int sof_resume(struct device *dev, bool runtime_resume) if (!sof_ops(sdev)->resume || !sof_ops(sdev)->runtime_resume) return 0; + /* DSP was never successfully started, nothing to resume */ + if (sdev->first_boot) + return 0; + /* * if the runtime_resume flag is set, call the runtime_resume routine * or else call the system resume routine |