Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95e99fda authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] hda-intel - Fix resume with power save 



The controller power wasn't turned on properly at resume due to the
power-saving patch.  Now fixed.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 51882453

sound/pci/hda/hda_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -1662,6 +1662,7 @@ static void hda_call_codec_suspend(struct hda_codec *codec) 
			    AC_PWRST_D3);

#ifdef CONFIG_SND_HDA_POWER_SAVE

	cancel_delayed_work(&codec->power_work);

	codec->power_on = 0;

#endif

}
@@ -2195,7 +2196,6 @@ static void hda_power_work(struct work_struct *work) 
		return;



	hda_call_codec_suspend(codec);

	codec->power_on = 0;

	if (codec->bus->ops.pm_notify)

		codec->bus->ops.pm_notify(codec);

}

sound/pci/hda/hda_intel.c

+1 −1
Original line number Diff line number Diff line
@@ -1500,7 +1500,7 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect) 


static void azx_stop_chip(struct azx *chip)

{

	if (chip->initialized)

	if (!chip->initialized)

		return;



	/* disable interrupts */