diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /sound/pci/bt87x.c | |
parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'sound/pci/bt87x.c')
-rw-r--r-- | sound/pci/bt87x.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index c9a2421cf6f0..4ecdd635ed1d 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c | |||
@@ -681,15 +681,12 @@ static struct snd_kcontrol_new snd_bt87x_capture_source = { | |||
681 | 681 | ||
682 | static int snd_bt87x_free(struct snd_bt87x *chip) | 682 | static int snd_bt87x_free(struct snd_bt87x *chip) |
683 | { | 683 | { |
684 | if (chip->mmio) { | 684 | if (chip->mmio) |
685 | snd_bt87x_stop(chip); | 685 | snd_bt87x_stop(chip); |
686 | if (chip->irq >= 0) | ||
687 | synchronize_irq(chip->irq); | ||
688 | |||
689 | iounmap(chip->mmio); | ||
690 | } | ||
691 | if (chip->irq >= 0) | 686 | if (chip->irq >= 0) |
692 | free_irq(chip->irq, chip); | 687 | free_irq(chip->irq, chip); |
688 | if (chip->mmio) | ||
689 | iounmap(chip->mmio); | ||
693 | pci_release_regions(chip->pci); | 690 | pci_release_regions(chip->pci); |
694 | pci_disable_device(chip->pci); | 691 | pci_disable_device(chip->pci); |
695 | kfree(chip); | 692 | kfree(chip); |