diff mbox series

[1/2] ALSA: hda: Re-add dropped snd_poewr_change_state() calls

Message ID 20210329113059.25035-1-tiwai@suse.de (mailing list archive)
State New
Headers show
Series [1/2] ALSA: hda: Re-add dropped snd_poewr_change_state() calls | expand

Commit Message

Takashi Iwai March 29, 2021, 11:30 a.m. UTC
The card power state change via snd_power_change_state() at the system
suspend/resume seems dropped mistakenly during the PM code rewrite.
The card power state doesn't play much role nowadays but it's still
referred in a few places such as the HDMI codec driver.

This patch restores them, but in a more appropriate place now in the
prepare and complete callbacks.

Fixes: f5dac54d9d93 ("ALSA: hda: Separate runtime and system suspend")
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
 sound/pci/hda/hda_intel.c | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series


diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 5b492c3f816c..12e51ac973c4 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1025,6 +1025,7 @@  static int azx_prepare(struct device *dev)
 	chip = card->private_data;
 	chip->pm_prepared = 1;
+	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
 	/* HDA controller always requires different WAKEEN for runtime suspend
 	 * and system suspend, so don't use direct-complete here.
@@ -1038,6 +1039,7 @@  static void azx_complete(struct device *dev)
 	struct azx *chip;
 	chip = card->private_data;
+	snd_power_change_state(card, SNDRV_CTL_POWER_D0);
 	chip->pm_prepared = 0;