diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2008-04-22 13:50:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 12:00:40 +0200 |
| commit | f000fd80937c0d94c67f9f3e7026f1fbc8ef8873 (patch) | |
| tree | a1364921df5ed78b387a767787ea945031b5b641 /sound/pci/es1968.c | |
| parent | 8a87c9cf999542db846c3ab93c1065d446427f37 (diff) | |
| download | linux-f000fd80937c0d94c67f9f3e7026f1fbc8ef8873.tar.bz2 | |
[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/es1968.c')
| -rw-r--r-- | sound/pci/es1968.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 138379896061..1bf298d214b9 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c @@ -2475,7 +2475,8 @@ static inline void snd_es1968_free_gameport(struct es1968 *chip) { } static int snd_es1968_free(struct es1968 *chip) { if (chip->io_port) { - synchronize_irq(chip->irq); + if (chip->irq >= 0) + synchronize_irq(chip->irq); outw(1, chip->io_port + 0x04); /* clear WP interrupts */ outw(0, chip->io_port + ESM_PORT_HOST_IRQ); /* disable IRQ */ } |