]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ALSA] bt87X: fix freeing of shared interrupt
authorClemens Ladisch <clemens@ladisch.de>
Fri, 22 Feb 2008 17:47:44 +0000 (18:47 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 22 Feb 2008 22:20:09 +0000 (14:20 -0800)
Call free_irq() after iounmap() because other devices could trigger our
shared interrupt handler.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
sound/pci/bt87x.c

index c9a2421cf6f0df75078da262250633171beaaac6..4ecdd635ed1d34bcf06749aa7dcc4ad7f6b0acb3 100644 (file)
@@ -681,15 +681,12 @@ static struct snd_kcontrol_new snd_bt87x_capture_source = {
 
 static int snd_bt87x_free(struct snd_bt87x *chip)
 {
-       if (chip->mmio) {
+       if (chip->mmio)
                snd_bt87x_stop(chip);
-               if (chip->irq >= 0)
-                       synchronize_irq(chip->irq);
-
-               iounmap(chip->mmio);
-       }
        if (chip->irq >= 0)
                free_irq(chip->irq, chip);
+       if (chip->mmio)
+               iounmap(chip->mmio);
        pci_release_regions(chip->pci);
        pci_disable_device(chip->pci);
        kfree(chip);