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/ali5451/ali5451.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/ali5451/ali5451.c')
-rw-r--r-- | sound/pci/ali5451/ali5451.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index fc04d3da1af5..1a0fd65ec280 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c | |||
@@ -2047,10 +2047,8 @@ static int snd_ali_free(struct snd_ali * codec) | |||
2047 | { | 2047 | { |
2048 | if (codec->hw_initialized) | 2048 | if (codec->hw_initialized) |
2049 | snd_ali_disable_address_interrupt(codec); | 2049 | snd_ali_disable_address_interrupt(codec); |
2050 | if (codec->irq >= 0) { | 2050 | if (codec->irq >= 0) |
2051 | synchronize_irq(codec->irq); | ||
2052 | free_irq(codec->irq, codec); | 2051 | free_irq(codec->irq, codec); |
2053 | } | ||
2054 | if (codec->port) | 2052 | if (codec->port) |
2055 | pci_release_regions(codec->pci); | 2053 | pci_release_regions(codec->pci); |
2056 | pci_disable_device(codec->pci); | 2054 | pci_disable_device(codec->pci); |