summaryrefslogtreecommitdiffstats
path: root/sound/pci/als300.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/als300.c')
-rw-r--r--sound/pci/als300.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 7bb6ac565107..57e034f208dc 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -37,8 +37,7 @@
37#include <linux/dma-mapping.h> 37#include <linux/dma-mapping.h>
38#include <linux/interrupt.h> 38#include <linux/interrupt.h>
39#include <linux/slab.h> 39#include <linux/slab.h>
40 40#include <linux/io.h>
41#include <asm/io.h>
42 41
43#include <sound/core.h> 42#include <sound/core.h>
44#include <sound/control.h> 43#include <sound/control.h>
@@ -728,35 +727,20 @@ static int snd_als300_create(struct snd_card *card,
728#ifdef CONFIG_PM_SLEEP 727#ifdef CONFIG_PM_SLEEP
729static int snd_als300_suspend(struct device *dev) 728static int snd_als300_suspend(struct device *dev)
730{ 729{
731 struct pci_dev *pci = to_pci_dev(dev);
732 struct snd_card *card = dev_get_drvdata(dev); 730 struct snd_card *card = dev_get_drvdata(dev);
733 struct snd_als300 *chip = card->private_data; 731 struct snd_als300 *chip = card->private_data;
734 732
735 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); 733 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
736 snd_pcm_suspend_all(chip->pcm); 734 snd_pcm_suspend_all(chip->pcm);
737 snd_ac97_suspend(chip->ac97); 735 snd_ac97_suspend(chip->ac97);
738
739 pci_disable_device(pci);
740 pci_save_state(pci);
741 pci_set_power_state(pci, PCI_D3hot);
742 return 0; 736 return 0;
743} 737}
744 738
745static int snd_als300_resume(struct device *dev) 739static int snd_als300_resume(struct device *dev)
746{ 740{
747 struct pci_dev *pci = to_pci_dev(dev);
748 struct snd_card *card = dev_get_drvdata(dev); 741 struct snd_card *card = dev_get_drvdata(dev);
749 struct snd_als300 *chip = card->private_data; 742 struct snd_als300 *chip = card->private_data;
750 743
751 pci_set_power_state(pci, PCI_D0);
752 pci_restore_state(pci);
753 if (pci_enable_device(pci) < 0) {
754 dev_err(dev, "pci_enable_device failed, disabling device\n");
755 snd_card_disconnect(card);
756 return -EIO;
757 }
758 pci_set_master(pci);
759
760 snd_als300_init(chip); 744 snd_als300_init(chip);
761 snd_ac97_resume(chip->ac97); 745 snd_ac97_resume(chip->ac97);
762 746