iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: hda: Disable runtime resume at shutdown

Browse Source 
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: b98444ed59 ("ALSA: hda: Suspend codec at shutdown")
Reported-and-tested-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210826154752.25674-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2021-08-26 17:47:52 +02:00
parent 6e41340994
commit 2eaf1635f9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/pci/hda/hda_codec.c
View File

@ -2986,13 +2986,11 @@ void snd_hda_codec_shutdown(struct hda_codec *codec)
{ {
struct hda_pcm *cpcm; struct hda_pcm *cpcm;
if (pm_runtime_suspended(hda_codec_dev(codec)))
return;
list_for_each_entry(cpcm, &codec->pcm_list_head, list) list_for_each_entry(cpcm, &codec->pcm_list_head, list)
snd_pcm_suspend_all(cpcm->pcm); 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));
} }
/* /*