ALSA: hda: Disable runtime resume at shutdown
PATCH 1/1 ALSA: hda: Disable runtime resume at shutdown
Although we modified the codec shutdown callback to perform runtime-suspend, it's still not fully effective, as this may be resumed again at any time later.
For fixing such an unwanted resume, this patch replaces pm_runtime_suspend() with pm_runtime_force_suspend(), and call pm_runtime_disable() afterward. It assures to keep the device suspended.
Also for code simplification, we apply the code unconditionally; when it's been already suspended, nothing would happen by calls of snd_pcm_suspend_all() and pm_runtime_force_suspend(), just proceed to pm_runtime_disable().
Fixes b98444ed597d ("ALSA: hda: Suspend codec at shutdown")
Reported-and-tested-by Vitaly Rodionov <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
--- sound/pci/hda/hda_codec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/pci/hda/hda_codec.c +2 -4
@@ -2986,13 +2986,11 @@ void snd_hda_codec_shutdown(struct hda_codec *codec) {struct hda_pcm *cpcm; -if (pm_runtime_suspended (hda_codec_dev (codec))) -return ; -list_for_each_entry (cpcm, &codec->pcm_list_head, list)snd_pcm_suspend_all (cpcm->pcm); -pm_runtime_suspend (hda_codec_dev (codec)); +pm_runtime_force_suspend (hda_codec_dev (codec)); +pm_runtime_disable (hda_codec_dev (codec)); }/*
Signature · 1 line
2.31.1