diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-01 18:52:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-01 18:52:26 -0300 |
| commit | c9eb88fca53978c15a4beea4bef308178cd1443a (patch) | |
| tree | 7f1d3538e3a1006ed5c2273daad8bdcc37de5c31 /linux/sound/pci | |
| parent | 49ba95a8ac08643c195b798ae687b2fe663ca01a (diff) | |
| parent | b9b51ddc029b64b109b6d9130f6e15876cadca20 (diff) | |
| download | mediapointer-dvb-s2-c9eb88fca53978c15a4beea4bef308178cd1443a.tar.gz mediapointer-dvb-s2-c9eb88fca53978c15a4beea4bef308178cd1443a.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tda18271
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound/pci')
| -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); |