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

Commit 30b35399 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Various fixes for suspend/resume of ALSA PCI drivers 



- Check the return value of pci_enable_device() and request_irq()
  in the suspend.  If any error occurs there, disable the device
  using snd_card_disconnect().
- Call pci_set_power_state() properly with pci_choose_state().
- Fix the order to call pci_set_power_state().
- Removed obsolete house-made PM codes in some drivers.

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

sound/pci/ali5451/ali5451.c

+10 −1
Original line number Diff line number Diff line
@@ -2032,8 +2032,10 @@ static int ali_suspend(struct pci_dev *pci, pm_message_t state) 
	outl(0xffffffff, ALI_REG(chip, ALI_STOP));



	spin_unlock_irq(&chip->reg_lock);



	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, pci_choose_state(pci, state));

	return 0;

}
@@ -2048,8 +2050,15 @@ static int ali_resume(struct pci_dev *pci) 
	if (! im)

		return 0;



	pci_set_power_state(pci, PCI_D0);

	pci_restore_state(pci);

	pci_enable_device(pci);

	if (pci_enable_device(pci) < 0) {

		printk(KERN_ERR "ali5451: pci_enable_device failed, "

		       "disabling device\n");

		snd_card_disconnect(card);

		return -EIO;

	}

	pci_set_master(pci);



	spin_lock_irq(&chip->reg_lock);

sound/pci/als300.c

+8 −3
Original line number Diff line number Diff line
@@ -768,9 +768,9 @@ static int snd_als300_suspend(struct pci_dev *pci, pm_message_t state) 
	snd_pcm_suspend_all(chip->pcm);

	snd_ac97_suspend(chip->ac97);



	pci_set_power_state(pci, PCI_D3hot);

	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, pci_choose_state(pci, state));

	return 0;

}
@@ -779,9 +779,14 @@ static int snd_als300_resume(struct pci_dev *pci) 
	struct snd_card *card = pci_get_drvdata(pci);

	struct snd_als300 *chip = card->private_data;



	pci_restore_state(pci);

	pci_enable_device(pci);

	pci_set_power_state(pci, PCI_D0);

	pci_restore_state(pci);

	if (pci_enable_device(pci) < 0) {

		printk(KERN_ERR "als300: pci_enable_device failed, "

		       "disabling device\n");

		snd_card_disconnect(card);

		return -EIO;

	}

	pci_set_master(pci);



	snd_als300_init(chip);

sound/pci/als4000.c

+8 −3
Original line number Diff line number Diff line
@@ -804,9 +804,9 @@ static int snd_als4000_suspend(struct pci_dev *pci, pm_message_t state) 
	snd_pcm_suspend_all(chip->pcm);

	snd_sbmixer_suspend(chip);



	pci_set_power_state(pci, PCI_D3hot);

	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, pci_choose_state(pci, state));

	return 0;

}
@@ -816,9 +816,14 @@ static int snd_als4000_resume(struct pci_dev *pci) 
	struct snd_card_als4000 *acard = card->private_data;

	struct snd_sb *chip = acard->chip;



	pci_restore_state(pci);

	pci_enable_device(pci);

	pci_set_power_state(pci, PCI_D0);

	pci_restore_state(pci);

	if (pci_enable_device(pci) < 0) {

		printk(KERN_ERR "als4000: pci_enable_device failed, "

		       "disabling device\n");

		snd_card_disconnect(card);

		return -EIO;

	}

	pci_set_master(pci);



	snd_als4000_configure(chip);

sound/pci/atiixp.c

+8 −3
Original line number Diff line number Diff line
@@ -1442,9 +1442,9 @@ static int snd_atiixp_suspend(struct pci_dev *pci, pm_message_t state) 
	snd_atiixp_aclink_down(chip);

	snd_atiixp_chip_stop(chip);



	pci_set_power_state(pci, PCI_D3hot);

	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, pci_choose_state(pci, state));

	return 0;

}
@@ -1454,9 +1454,14 @@ static int snd_atiixp_resume(struct pci_dev *pci) 
	struct atiixp *chip = card->private_data;

	int i;



	pci_restore_state(pci);

	pci_enable_device(pci);

	pci_set_power_state(pci, PCI_D0);

	pci_restore_state(pci);

	if (pci_enable_device(pci) < 0) {

		printk(KERN_ERR "atiixp: pci_enable_device failed, "

		       "disabling device\n");

		snd_card_disconnect(card);

		return -EIO;

	}

	pci_set_master(pci);



	snd_atiixp_aclink_reset(chip);

sound/pci/atiixp_modem.c

+8 −3
Original line number Diff line number Diff line
@@ -1128,9 +1128,9 @@ static int snd_atiixp_suspend(struct pci_dev *pci, pm_message_t state) 
	snd_atiixp_aclink_down(chip);

	snd_atiixp_chip_stop(chip);



	pci_set_power_state(pci, PCI_D3hot);

	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, pci_choose_state(pci, state));

	return 0;

}
@@ -1140,9 +1140,14 @@ static int snd_atiixp_resume(struct pci_dev *pci) 
	struct atiixp_modem *chip = card->private_data;

	int i;



	pci_restore_state(pci);

	pci_enable_device(pci);

	pci_set_power_state(pci, PCI_D0);

	pci_restore_state(pci);

	if (pci_enable_device(pci) < 0) {

		printk(KERN_ERR "atiixp-modem: pci_enable_device failed, "

		       "disabling device\n");

		snd_card_disconnect(card);

		return -EIO;

	}

	pci_set_master(pci);



	snd_atiixp_aclink_reset(chip);