|
@@ -1910,7 +1910,6 @@ static void snd_ca0106_remove(struct pci_dev *pci)
|
|
#ifdef CONFIG_PM_SLEEP
|
|
#ifdef CONFIG_PM_SLEEP
|
|
static int snd_ca0106_suspend(struct device *dev)
|
|
static int snd_ca0106_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_ca0106 *chip = card->private_data;
|
|
struct snd_ca0106 *chip = card->private_data;
|
|
int i;
|
|
int i;
|
|
@@ -1923,30 +1922,15 @@ static int snd_ca0106_suspend(struct device *dev)
|
|
snd_ca0106_mixer_suspend(chip);
|
|
snd_ca0106_mixer_suspend(chip);
|
|
|
|
|
|
ca0106_stop_chip(chip);
|
|
ca0106_stop_chip(chip);
|
|
-
|
|
|
|
- pci_disable_device(pci);
|
|
|
|
- pci_save_state(pci);
|
|
|
|
- pci_set_power_state(pci, PCI_D3hot);
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
static int snd_ca0106_resume(struct device *dev)
|
|
static int snd_ca0106_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_ca0106 *chip = card->private_data;
|
|
struct snd_ca0106 *chip = card->private_data;
|
|
int i;
|
|
int i;
|
|
|
|
|
|
- pci_set_power_state(pci, PCI_D0);
|
|
|
|
- pci_restore_state(pci);
|
|
|
|
-
|
|
|
|
- if (pci_enable_device(pci) < 0) {
|
|
|
|
- snd_card_disconnect(card);
|
|
|
|
- return -EIO;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- pci_set_master(pci);
|
|
|
|
-
|
|
|
|
ca0106_init_chip(chip, 1);
|
|
ca0106_init_chip(chip, 1);
|
|
|
|
|
|
if (chip->details->ac97)
|
|
if (chip->details->ac97)
|