|
@@ -1153,7 +1153,6 @@ static void riptide_handleirq(unsigned long dev_id)
|
|
#ifdef CONFIG_PM_SLEEP
|
|
#ifdef CONFIG_PM_SLEEP
|
|
static int riptide_suspend(struct device *dev)
|
|
static int riptide_suspend(struct device *dev)
|
|
{
|
|
{
|
|
- struct pci_dev *pci = to_pci_dev(dev);
|
|
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
struct snd_riptide *chip = card->private_data;
|
|
struct snd_riptide *chip = card->private_data;
|
|
|
|
|
|
@@ -1161,27 +1160,14 @@ static int riptide_suspend(struct device *dev)
|
|
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
|
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
|
snd_pcm_suspend_all(chip->pcm);
|
|
snd_pcm_suspend_all(chip->pcm);
|
|
snd_ac97_suspend(chip->ac97);
|
|
snd_ac97_suspend(chip->ac97);
|
|
- pci_disable_device(pci);
|
|
|
|
- pci_save_state(pci);
|
|
|
|
- pci_set_power_state(pci, PCI_D3hot);
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
static int riptide_resume(struct device *dev)
|
|
static int riptide_resume(struct device *dev)
|
|
{
|
|
{
|
|
- struct pci_dev *pci = to_pci_dev(dev);
|
|
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
struct snd_card *card = dev_get_drvdata(dev);
|
|
struct snd_riptide *chip = card->private_data;
|
|
struct snd_riptide *chip = card->private_data;
|
|
|
|
|
|
- pci_set_power_state(pci, PCI_D0);
|
|
|
|
- pci_restore_state(pci);
|
|
|
|
- if (pci_enable_device(pci) < 0) {
|
|
|
|
- printk(KERN_ERR "riptide: pci_enable_device failed, "
|
|
|
|
- "disabling device\n");
|
|
|
|
- snd_card_disconnect(card);
|
|
|
|
- return -EIO;
|
|
|
|
- }
|
|
|
|
- pci_set_master(pci);
|
|
|
|
snd_riptide_initialize(chip);
|
|
snd_riptide_initialize(chip);
|
|
snd_ac97_resume(chip->ac97);
|
|
snd_ac97_resume(chip->ac97);
|
|
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
|
|
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
|