aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/intel8x0m.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/intel8x0m.c')
-rw-r--r--sound/pci/intel8x0m.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 6b40235be13c..748f6f67c982 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -1023,7 +1023,6 @@ static int snd_intel8x0m_free(struct intel8x0m *chip)
1023 */ 1023 */
1024static int intel8x0m_suspend(struct device *dev) 1024static int intel8x0m_suspend(struct device *dev)
1025{ 1025{
1026 struct pci_dev *pci = to_pci_dev(dev);
1027 struct snd_card *card = dev_get_drvdata(dev); 1026 struct snd_card *card = dev_get_drvdata(dev);
1028 struct intel8x0m *chip = card->private_data; 1027 struct intel8x0m *chip = card->private_data;
1029 int i; 1028 int i;
@@ -1036,9 +1035,6 @@ static int intel8x0m_suspend(struct device *dev)
1036 free_irq(chip->irq, chip); 1035 free_irq(chip->irq, chip);
1037 chip->irq = -1; 1036 chip->irq = -1;
1038 } 1037 }
1039 pci_disable_device(pci);
1040 pci_save_state(pci);
1041 pci_set_power_state(pci, PCI_D3hot);
1042 return 0; 1038 return 0;
1043} 1039}
1044 1040
@@ -1048,14 +1044,6 @@ static int intel8x0m_resume(struct device *dev)
1048 struct snd_card *card = dev_get_drvdata(dev); 1044 struct snd_card *card = dev_get_drvdata(dev);
1049 struct intel8x0m *chip = card->private_data; 1045 struct intel8x0m *chip = card->private_data;
1050 1046
1051 pci_set_power_state(pci, PCI_D0);
1052 pci_restore_state(pci);
1053 if (pci_enable_device(pci) < 0) {
1054 dev_err(dev, "pci_enable_device failed, disabling device\n");
1055 snd_card_disconnect(card);
1056 return -EIO;
1057 }
1058 pci_set_master(pci);
1059 if (request_irq(pci->irq, snd_intel8x0m_interrupt, 1047 if (request_irq(pci->irq, snd_intel8x0m_interrupt,
1060 IRQF_SHARED, KBUILD_MODNAME, chip)) { 1048 IRQF_SHARED, KBUILD_MODNAME, chip)) {
1061 dev_err(dev, "unable to grab IRQ %d, disabling device\n", 1049 dev_err(dev, "unable to grab IRQ %d, disabling device\n",