|
@@ -2694,7 +2694,6 @@ snd_azf3328_resume_ac97(const struct snd_azf3328 *chip)
|
|
|
static int
|
|
|
snd_azf3328_suspend(struct device *dev)
|
|
|
{
|
|
|
- struct pci_dev *pci = to_pci_dev(dev);
|
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
|
struct snd_azf3328 *chip = card->private_data;
|
|
|
u16 *saved_regs_ctrl_u16;
|
|
@@ -2720,29 +2719,15 @@ snd_azf3328_suspend(struct device *dev)
|
|
|
ARRAY_SIZE(chip->saved_regs_mpu), chip->saved_regs_mpu);
|
|
|
snd_azf3328_suspend_regs(chip, chip->opl3_io,
|
|
|
ARRAY_SIZE(chip->saved_regs_opl3), chip->saved_regs_opl3);
|
|
|
-
|
|
|
- pci_disable_device(pci);
|
|
|
- pci_save_state(pci);
|
|
|
- pci_set_power_state(pci, PCI_D3hot);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
static int
|
|
|
snd_azf3328_resume(struct device *dev)
|
|
|
{
|
|
|
- struct pci_dev *pci = to_pci_dev(dev);
|
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
|
const struct snd_azf3328 *chip = card->private_data;
|
|
|
|
|
|
- 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_azf3328_resume_regs(chip, chip->saved_regs_game, chip->game_io,
|
|
|
ARRAY_SIZE(chip->saved_regs_game));
|
|
|
snd_azf3328_resume_regs(chip, chip->saved_regs_mpu, chip->mpu_io,
|