diff options
Diffstat (limited to 'sound/pci/ice1712')
| -rw-r--r-- | sound/pci/ice1712/ice1712.c | 5 | ||||
| -rw-r--r-- | sound/pci/ice1712/ice1724.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 38e93ca12e27..29d449d73c98 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
| @@ -2490,10 +2490,9 @@ static int snd_ice1712_free(struct snd_ice1712 *ice) | |||
| 2490 | outb(0xff, ICEREG(ice, IRQMASK)); | 2490 | outb(0xff, ICEREG(ice, IRQMASK)); |
| 2491 | /* --- */ | 2491 | /* --- */ |
| 2492 | __hw_end: | 2492 | __hw_end: |
| 2493 | if (ice->irq >= 0) { | 2493 | if (ice->irq >= 0) |
| 2494 | synchronize_irq(ice->irq); | ||
| 2495 | free_irq(ice->irq, ice); | 2494 | free_irq(ice->irq, ice); |
| 2496 | } | 2495 | |
| 2497 | if (ice->port) | 2496 | if (ice->port) |
| 2498 | pci_release_regions(ice->pci); | 2497 | pci_release_regions(ice->pci); |
| 2499 | snd_ice1712_akm4xxx_free(ice); | 2498 | snd_ice1712_akm4xxx_free(ice); |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 6b15e1cbfe4f..13ea94f317cb 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
| @@ -2153,10 +2153,8 @@ static int snd_vt1724_free(struct snd_ice1712 *ice) | |||
| 2153 | outb(0xff, ICEREG1724(ice, IRQMASK)); | 2153 | outb(0xff, ICEREG1724(ice, IRQMASK)); |
| 2154 | /* --- */ | 2154 | /* --- */ |
| 2155 | __hw_end: | 2155 | __hw_end: |
| 2156 | if (ice->irq >= 0) { | 2156 | if (ice->irq >= 0) |
| 2157 | synchronize_irq(ice->irq); | ||
| 2158 | free_irq(ice->irq, ice); | 2157 | free_irq(ice->irq, ice); |
| 2159 | } | ||
| 2160 | pci_release_regions(ice->pci); | 2158 | pci_release_regions(ice->pci); |
| 2161 | snd_ice1712_akm4xxx_free(ice); | 2159 | snd_ice1712_akm4xxx_free(ice); |
| 2162 | pci_disable_device(ice->pci); | 2160 | pci_disable_device(ice->pci); |