diff options
Diffstat (limited to 'sound/pci/sis7019.c')
-rw-r--r-- | sound/pci/sis7019.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index 5e9437ba6eec..efe669b80256 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c | |||
@@ -1208,7 +1208,6 @@ static int sis_chip_init(struct sis7019 *sis) | |||
1208 | #ifdef CONFIG_PM_SLEEP | 1208 | #ifdef CONFIG_PM_SLEEP |
1209 | static int sis_suspend(struct device *dev) | 1209 | static int sis_suspend(struct device *dev) |
1210 | { | 1210 | { |
1211 | struct pci_dev *pci = to_pci_dev(dev); | ||
1212 | struct snd_card *card = dev_get_drvdata(dev); | 1211 | struct snd_card *card = dev_get_drvdata(dev); |
1213 | struct sis7019 *sis = card->private_data; | 1212 | struct sis7019 *sis = card->private_data; |
1214 | void __iomem *ioaddr = sis->ioaddr; | 1213 | void __iomem *ioaddr = sis->ioaddr; |
@@ -1237,9 +1236,6 @@ static int sis_suspend(struct device *dev) | |||
1237 | ioaddr += 4096; | 1236 | ioaddr += 4096; |
1238 | } | 1237 | } |
1239 | 1238 | ||
1240 | pci_disable_device(pci); | ||
1241 | pci_save_state(pci); | ||
1242 | pci_set_power_state(pci, PCI_D3hot); | ||
1243 | return 0; | 1239 | return 0; |
1244 | } | 1240 | } |
1245 | 1241 | ||
@@ -1251,14 +1247,6 @@ static int sis_resume(struct device *dev) | |||
1251 | void __iomem *ioaddr = sis->ioaddr; | 1247 | void __iomem *ioaddr = sis->ioaddr; |
1252 | int i; | 1248 | int i; |
1253 | 1249 | ||
1254 | pci_set_power_state(pci, PCI_D0); | ||
1255 | pci_restore_state(pci); | ||
1256 | |||
1257 | if (pci_enable_device(pci) < 0) { | ||
1258 | dev_err(&pci->dev, "unable to re-enable device\n"); | ||
1259 | goto error; | ||
1260 | } | ||
1261 | |||
1262 | if (sis_chip_init(sis)) { | 1250 | if (sis_chip_init(sis)) { |
1263 | dev_err(&pci->dev, "unable to re-init controller\n"); | 1251 | dev_err(&pci->dev, "unable to re-init controller\n"); |
1264 | goto error; | 1252 | goto error; |
@@ -1281,7 +1269,6 @@ static int sis_resume(struct device *dev) | |||
1281 | memset(sis->suspend_state[0], 0, 4096); | 1269 | memset(sis->suspend_state[0], 0, 4096); |
1282 | 1270 | ||
1283 | sis->irq = pci->irq; | 1271 | sis->irq = pci->irq; |
1284 | pci_set_master(pci); | ||
1285 | 1272 | ||
1286 | if (sis->codecs_present & SIS_PRIMARY_CODEC_PRESENT) | 1273 | if (sis->codecs_present & SIS_PRIMARY_CODEC_PRESENT) |
1287 | snd_ac97_resume(sis->ac97[0]); | 1274 | snd_ac97_resume(sis->ac97[0]); |