ALSA: hda: Re-add dropped snd_poewr_change_state() calls
authorTakashi Iwai <tiwai@suse.de>
Mon, 29 Mar 2021 11:30:58 +0000 (13:30 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 30 Mar 2021 11:16:22 +0000 (13:16 +0200)
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>
Link: https://lore.kernel.org/r/20210329113059.25035-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_intel.c

index 5eea130dcf0a593d4c2373df25305fc90e33f811..c4146e8617de03e240e702e58f084aa4e4a1f034 100644 (file)
@@ -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);
 
        flush_work(&azx_bus(chip)->unsol_work);
 
@@ -1040,6 +1041,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;
 }