From 96e68dee554c5a2529bb70972c9954e62c36386d Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 27 Mar 2008 09:22:06 -0300 Subject: Update some files from mainstream From: Mauro Carvalho Chehab Those files are maintained on other trees. Just update them to the newest version. kernel-sync: Signed-off-by: Mauro Carvalho Chehab --- linux/sound/pci/bt87x.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'linux/sound') 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); -- cgit v1.2.3