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/intel8x0m.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/intel8x0m.c')
-rw-r--r-- | sound/pci/intel8x0m.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index cadda8d6b70f..15db810d5893 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c | |||
@@ -986,7 +986,8 @@ static int snd_intel8x0_free(struct intel8x0m *chip) | |||
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 | /* --- */ |
989 | synchronize_irq(chip->irq); | 989 | if (chip->irq >= 0) |
990 | synchronize_irq(chip->irq); | ||
990 | __hw_end: | 991 | __hw_end: |
991 | if (chip->bdbars.area) | 992 | if (chip->bdbars.area) |
992 | snd_dma_free_pages(&chip->bdbars); | 993 | snd_dma_free_pages(&chip->bdbars); |