aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/pci/intel8x0m.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@redhat.com>2008-04-22 13:50:34 +0200
committerTakashi Iwai <tiwai@suse.de>2008-04-24 12:00:40 +0200
commitf000fd80937c0d94c67f9f3e7026f1fbc8ef8873 (patch)
treea1364921df5ed78b387a767787ea945031b5b641 /sound/pci/intel8x0m.c
parent[ALSA] Audiophile 192: Fix ad converter initialization (diff)
downloadwireguard-linux-f000fd80937c0d94c67f9f3e7026f1fbc8ef8873.tar.xz
wireguard-linux-f000fd80937c0d94c67f9f3e7026f1fbc8ef8873.zip
[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.c3
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)
for (i = 0; i < chip->bdbars_count; i++)
iputbyte(chip, ICH_REG_OFF_CR + chip->ichd[i].reg_offset, ICH_RESETREGS);
/* --- */
- synchronize_irq(chip->irq);
+ if (chip->irq >= 0)
+ synchronize_irq(chip->irq);
__hw_end:
if (chip->bdbars.area)
snd_dma_free_pages(&chip->bdbars);