diff options
Diffstat (limited to 'linux/sound')
-rw-r--r-- | linux/sound/pci/bt87x.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index ec58f2795..7e6f22041 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -28,7 +28,7 @@ #include <linux/moduleparam.h> #include <linux/bitops.h> #include <asm/io.h> -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,24) +#ifdef NEED_SOUND_DRIVER_H #include <sound/driver.h> #endif #include <sound/core.h> @@ -712,15 +712,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); |