diff options
Diffstat (limited to 'sound/pci/oxygen/oxygen_lib.c')
-rw-r--r-- | sound/pci/oxygen/oxygen_lib.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index 61a62c0d3488..dbf1f2d4e4b5 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c | |||
@@ -728,7 +728,6 @@ EXPORT_SYMBOL(oxygen_pci_remove); | |||
728 | #ifdef CONFIG_PM_SLEEP | 728 | #ifdef CONFIG_PM_SLEEP |
729 | static int oxygen_pci_suspend(struct device *dev) | 729 | static int oxygen_pci_suspend(struct device *dev) |
730 | { | 730 | { |
731 | struct pci_dev *pci = to_pci_dev(dev); | ||
732 | struct snd_card *card = dev_get_drvdata(dev); | 731 | struct snd_card *card = dev_get_drvdata(dev); |
733 | struct oxygen *chip = card->private_data; | 732 | struct oxygen *chip = card->private_data; |
734 | unsigned int i, saved_interrupt_mask; | 733 | unsigned int i, saved_interrupt_mask; |
@@ -752,10 +751,6 @@ static int oxygen_pci_suspend(struct device *dev) | |||
752 | flush_work(&chip->spdif_input_bits_work); | 751 | flush_work(&chip->spdif_input_bits_work); |
753 | flush_work(&chip->gpio_work); | 752 | flush_work(&chip->gpio_work); |
754 | chip->interrupt_mask = saved_interrupt_mask; | 753 | chip->interrupt_mask = saved_interrupt_mask; |
755 | |||
756 | pci_disable_device(pci); | ||
757 | pci_save_state(pci); | ||
758 | pci_set_power_state(pci, PCI_D3hot); | ||
759 | return 0; | 754 | return 0; |
760 | } | 755 | } |
761 | 756 | ||
@@ -787,20 +782,10 @@ static void oxygen_restore_ac97(struct oxygen *chip, unsigned int codec) | |||
787 | 782 | ||
788 | static int oxygen_pci_resume(struct device *dev) | 783 | static int oxygen_pci_resume(struct device *dev) |
789 | { | 784 | { |
790 | struct pci_dev *pci = to_pci_dev(dev); | ||
791 | struct snd_card *card = dev_get_drvdata(dev); | 785 | struct snd_card *card = dev_get_drvdata(dev); |
792 | struct oxygen *chip = card->private_data; | 786 | struct oxygen *chip = card->private_data; |
793 | unsigned int i; | 787 | unsigned int i; |
794 | 788 | ||
795 | pci_set_power_state(pci, PCI_D0); | ||
796 | pci_restore_state(pci); | ||
797 | if (pci_enable_device(pci) < 0) { | ||
798 | dev_err(dev, "cannot reenable device"); | ||
799 | snd_card_disconnect(card); | ||
800 | return -EIO; | ||
801 | } | ||
802 | pci_set_master(pci); | ||
803 | |||
804 | oxygen_write16(chip, OXYGEN_DMA_STATUS, 0); | 789 | oxygen_write16(chip, OXYGEN_DMA_STATUS, 0); |
805 | oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, 0); | 790 | oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, 0); |
806 | for (i = 0; i < OXYGEN_IO_SIZE; ++i) | 791 | for (i = 0; i < OXYGEN_IO_SIZE; ++i) |