Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / sound / pci / sis7019.c

diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index 7f6a0a0d115a9a65dbbcfaec7ad01842a95829e0..efe669b802569904a211f7cef8235d95b505cf71 100644 (file)
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -1064,12 +1064,9 @@ static int sis_chip_free(struct sis7019 *sis)
        if (sis->irq >= 0)
                free_irq(sis->irq, sis);
 
-       if (sis->ioaddr)
-               iounmap(sis->ioaddr);
-
+       iounmap(sis->ioaddr);
        pci_release_regions(sis->pci);
        pci_disable_device(sis->pci);
-
        sis_free_suspend(sis);
        return 0;
 }
@@ -1211,7 +1208,6 @@ static int sis_chip_init(struct sis7019 *sis)
 #ifdef CONFIG_PM_SLEEP
 static int sis_suspend(struct device *dev)
 {
-       struct pci_dev *pci = to_pci_dev(dev);
        struct snd_card *card = dev_get_drvdata(dev);
        struct sis7019 *sis = card->private_data;
        void __iomem *ioaddr = sis->ioaddr;
@@ -1240,9 +1236,6 @@ static int sis_suspend(struct device *dev)
                ioaddr += 4096;
        }
 
-       pci_disable_device(pci);
-       pci_save_state(pci);
-       pci_set_power_state(pci, PCI_D3hot);
        return 0;
 }
 
@@ -1254,14 +1247,6 @@ static int sis_resume(struct device *dev)
        void __iomem *ioaddr = sis->ioaddr;
        int i;
 
-       pci_set_power_state(pci, PCI_D0);
-       pci_restore_state(pci);
-
-       if (pci_enable_device(pci) < 0) {
-               dev_err(&pci->dev, "unable to re-enable device\n");
-               goto error;
-       }
-
        if (sis_chip_init(sis)) {
                dev_err(&pci->dev, "unable to re-init controller\n");
                goto error;
@@ -1284,7 +1269,6 @@ static int sis_resume(struct device *dev)
        memset(sis->suspend_state[0], 0, 4096);
 
        sis->irq = pci->irq;
-       pci_set_master(pci);
 
        if (sis->codecs_present & SIS_PRIMARY_CODEC_PRESENT)
                snd_ac97_resume(sis->ac97[0]);