diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-11 13:26:48 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-11 13:26:48 +0300 |
| commit | 9e5947465d72ef1b3a88104474ab2adf78837220 (patch) | |
| tree | 2e71fa8e496b8e047e5a90e81b685ed1f8d3ed7f /sound/pci/es1938.c | |
| parent | 624afe4dc9a08992b200046dfe8a61f19bab74ab (diff) | |
| parent | 3e41c9b5a1ca2acfd9306a918fe3903f02eb89ca (diff) | |
| download | linux-9e5947465d72ef1b3a88104474ab2adf78837220.tar.xz | |
Merge branch 'topic/pci-cleanup' into for-next
Diffstat (limited to 'sound/pci/es1938.c')
| -rw-r--r-- | sound/pci/es1938.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 0fc46eb4e251..a01454b545a0 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c @@ -1454,7 +1454,6 @@ static unsigned char saved_regs[SAVED_REG_SIZE+1] = { static int es1938_suspend(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct es1938 *chip = card->private_data; unsigned char *s, *d; @@ -1471,9 +1470,6 @@ static int es1938_suspend(struct device *dev) free_irq(chip->irq, chip); chip->irq = -1; } - pci_disable_device(pci); - pci_save_state(pci); - pci_set_power_state(pci, PCI_D3hot); return 0; } @@ -1484,14 +1480,6 @@ static int es1938_resume(struct device *dev) struct es1938 *chip = card->private_data; unsigned char *s, *d; - 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; - } - if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { dev_err(dev, "unable to grab IRQ %d, disabling device\n", |