diff options
author | Jeff Garzik <jgarzik@redhat.com> | 2008-04-22 07:50:34 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:40 -0400 |
commit | f000fd80937c0d94c67f9f3e7026f1fbc8ef8873 (patch) | |
tree | a1364921df5ed78b387a767787ea945031b5b641 /sound/pci/ice1712/ice1712.c | |
parent | 8a87c9cf999542db846c3ab93c1065d446427f37 (diff) |
[ALSA] Fix synchronize_irq() bugs, redundancies
free_irq() calls synchronize_irq() for you, so there is no need for
drivers to manually do the same thing (again). Thus, calls where
sync-irq immediately precedes free-irq can be simplified.
However, during this audit several bugs were noticed, where free-irq is
preceded by a "irq >= 0" check... but the sync-irq call is not covered
by the same check.
So, where sync-irq could not be eliminated completely, the missing check
was added.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712/ice1712.c')
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 5 |
1 files changed, 2 insertions, 3 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); |