|
@@ -2383,7 +2383,6 @@ static void snd_es1968_start_irq(struct es1968 *chip)
|
|
|
*/
|
|
|
static int es1968_suspend(struct device *dev)
|
|
|
{
|
|
|
- struct pci_dev *pci = to_pci_dev(dev);
|
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
|
struct es1968 *chip = card->private_data;
|
|
|
|
|
@@ -2396,16 +2395,11 @@ static int es1968_suspend(struct device *dev)
|
|
|
snd_pcm_suspend_all(chip->pcm);
|
|
|
snd_ac97_suspend(chip->ac97);
|
|
|
snd_es1968_bob_stop(chip);
|
|
|
-
|
|
|
- pci_disable_device(pci);
|
|
|
- pci_save_state(pci);
|
|
|
- pci_set_power_state(pci, PCI_D3hot);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
static int es1968_resume(struct device *dev)
|
|
|
{
|
|
|
- struct pci_dev *pci = to_pci_dev(dev);
|
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
|
struct es1968 *chip = card->private_data;
|
|
|
struct esschan *es;
|
|
@@ -2413,16 +2407,6 @@ static int es1968_resume(struct device *dev)
|
|
|
if (! chip->do_pm)
|
|
|
return 0;
|
|
|
|
|
|
- /* restore all our config */
|
|
|
- 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_es1968_chip_init(chip);
|
|
|
|
|
|
/* need to restore the base pointers.. */
|