diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-27 09:22:06 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-27 09:22:06 -0300 |
| commit | 96e68dee554c5a2529bb70972c9954e62c36386d (patch) | |
| tree | 89bbf0baba6994cb2757a216d5253ec5e94e9c46 /linux/sound | |
| parent | b551799548f9bfe9e20df63ae1263df5a367f8e3 (diff) | |
| download | mediapointer-dvb-s2-96e68dee554c5a2529bb70972c9954e62c36386d.tar.gz mediapointer-dvb-s2-96e68dee554c5a2529bb70972c9954e62c36386d.tar.bz2 | |
Update some files from mainstream
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Those files are maintained on other trees. Just update them to the newest
version.
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound')
| -rw-r--r-- | linux/sound/pci/bt87x.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index ec58f2795..aeef46b61 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -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); |