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

Commit c5c21523 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Avoid doubly suspend after vga switcheroo 



The HD-audio driver artificially calls the suspend and the resume code
path in the VGA switcheroo state changes.  When a machine goes to
suspend, it tries to suspend the device again, and it stalls at
snd_power_wait().

This patch adds checks whether the devices were already in (forced)
suspend in PM callbacks for avoiding the doubly suspend.

Reported-by: default avatarDaniel J Blueman <daniel@quora.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1d31affb

sound/pci/hda/hda_intel.c

+6 −0
Original line number Diff line number Diff line
@@ -2630,6 +2630,9 @@ static int azx_suspend(struct device *dev) 
	struct azx *chip = card->private_data;

	struct azx_pcm *p;



	if (chip->disabled)

		return 0;



	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);

	azx_clear_irq_pending(chip);

	list_for_each_entry(p, &chip->pcm_list, list)
@@ -2655,6 +2658,9 @@ static int azx_resume(struct device *dev) 
	struct snd_card *card = dev_get_drvdata(dev);

	struct azx *chip = card->private_data;



	if (chip->disabled)

		return 0;



	pci_set_power_state(pci, PCI_D0);

	pci_restore_state(pci);

	if (pci_enable_device(pci) < 0) {