|
@@ -2654,7 +2654,6 @@ static int snd_intel8x0_free(struct intel8x0 *chip)
|
|
|
*/
|
|
|
static int intel8x0_suspend(struct device *dev)
|
|
|
{
|
|
|
- struct pci_dev *pci = to_pci_dev(dev);
|
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
|
struct intel8x0 *chip = card->private_data;
|
|
|
int i;
|
|
@@ -2682,12 +2681,6 @@ static int intel8x0_suspend(struct device *dev)
|
|
|
free_irq(chip->irq, chip);
|
|
|
chip->irq = -1;
|
|
|
}
|
|
|
- pci_disable_device(pci);
|
|
|
- pci_save_state(pci);
|
|
|
- /* The call below may disable built-in speaker on some laptops
|
|
|
- * after S2RAM. So, don't touch it.
|
|
|
- */
|
|
|
- /* pci_set_power_state(pci, PCI_D3hot); */
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -2698,14 +2691,6 @@ static int intel8x0_resume(struct device *dev)
|
|
|
struct intel8x0 *chip = card->private_data;
|
|
|
int i;
|
|
|
|
|
|
- pci_set_power_state(pci, PCI_D0);
|
|
|
- pci_restore_state(pci);
|
|
|
- if (pci_enable_device(pci) < 0) {
|
|
|
- dev_err(dev, "pci_enable_device failed, disabling device\n");
|
|
|
- snd_card_disconnect(card);
|
|
|
- return -EIO;
|
|
|
- }
|
|
|
- pci_set_master(pci);
|
|
|
snd_intel8x0_chip_init(chip, 0);
|
|
|
if (request_irq(pci->irq, snd_intel8x0_interrupt,
|
|
|
IRQF_SHARED, KBUILD_MODNAME, chip)) {
|