Commit 2eaf1635 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: b98444ed ("ALSA: hda: Suspend codec at shutdown")
Reported-and-tested-by: default avatarVitaly Rodionov <vitalyr@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210826154752.25674-1-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6e413409

sound/pci/hda/hda_codec.c

+2 −4
Original line number Diff line number Diff line
@@ -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));

}



/*