diff options
Diffstat (limited to 'sound/pci/intel8x0m.c')
| -rw-r--r-- | sound/pci/intel8x0m.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index cadda8d6b70f..faf674e671ac 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c | |||
| @@ -985,17 +985,15 @@ static int snd_intel8x0_free(struct intel8x0m *chip) | |||
| 985 | /* reset channels */ | 985 | /* reset channels */ |
| 986 | for (i = 0; i < chip->bdbars_count; i++) | 986 | for (i = 0; i < chip->bdbars_count; i++) |
| 987 | iputbyte(chip, ICH_REG_OFF_CR + chip->ichd[i].reg_offset, ICH_RESETREGS); | 987 | iputbyte(chip, ICH_REG_OFF_CR + chip->ichd[i].reg_offset, ICH_RESETREGS); |
| 988 | /* --- */ | 988 | __hw_end: |
| 989 | synchronize_irq(chip->irq); | 989 | if (chip->irq >= 0) |
| 990 | __hw_end: | 990 | free_irq(chip->irq, chip); |
| 991 | if (chip->bdbars.area) | 991 | if (chip->bdbars.area) |
| 992 | snd_dma_free_pages(&chip->bdbars); | 992 | snd_dma_free_pages(&chip->bdbars); |
| 993 | if (chip->addr) | 993 | if (chip->addr) |
| 994 | pci_iounmap(chip->pci, chip->addr); | 994 | pci_iounmap(chip->pci, chip->addr); |
| 995 | if (chip->bmaddr) | 995 | if (chip->bmaddr) |
| 996 | pci_iounmap(chip->pci, chip->bmaddr); | 996 | pci_iounmap(chip->pci, chip->bmaddr); |
| 997 | if (chip->irq >= 0) | ||
| 998 | free_irq(chip->irq, chip); | ||
| 999 | pci_release_regions(chip->pci); | 997 | pci_release_regions(chip->pci); |
| 1000 | pci_disable_device(chip->pci); | 998 | pci_disable_device(chip->pci); |
| 1001 | kfree(chip); | 999 | kfree(chip); |
| @@ -1017,7 +1015,6 @@ static int intel8x0m_suspend(struct pci_dev *pci, pm_message_t state) | |||
| 1017 | snd_pcm_suspend_all(chip->pcm[i]); | 1015 | snd_pcm_suspend_all(chip->pcm[i]); |
| 1018 | snd_ac97_suspend(chip->ac97); | 1016 | snd_ac97_suspend(chip->ac97); |
| 1019 | if (chip->irq >= 0) { | 1017 | if (chip->irq >= 0) { |
| 1020 | synchronize_irq(chip->irq); | ||
| 1021 | free_irq(chip->irq, chip); | 1018 | free_irq(chip->irq, chip); |
| 1022 | chip->irq = -1; | 1019 | chip->irq = -1; |
| 1023 | } | 1020 | } |
