diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
tree | e1be8645297f8ebe87445251743ebcc52081a20d /sound/oss/btaudio.c | |
parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'sound/oss/btaudio.c')
-rw-r--r-- | sound/oss/btaudio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/oss/btaudio.c b/sound/oss/btaudio.c index 6ad384114239..ad7210a00dc0 100644 --- a/sound/oss/btaudio.c +++ b/sound/oss/btaudio.c | |||
@@ -1020,6 +1020,7 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev, | |||
1020 | fail2: | 1020 | fail2: |
1021 | free_irq(bta->irq,bta); | 1021 | free_irq(bta->irq,bta); |
1022 | fail1: | 1022 | fail1: |
1023 | iounmap(bta->mmio); | ||
1023 | kfree(bta); | 1024 | kfree(bta); |
1024 | fail0: | 1025 | fail0: |
1025 | release_mem_region(pci_resource_start(pci_dev,0), | 1026 | release_mem_region(pci_resource_start(pci_dev,0), |
@@ -1051,6 +1052,7 @@ static void __devexit btaudio_remove(struct pci_dev *pci_dev) | |||
1051 | free_irq(bta->irq,bta); | 1052 | free_irq(bta->irq,bta); |
1052 | release_mem_region(pci_resource_start(pci_dev,0), | 1053 | release_mem_region(pci_resource_start(pci_dev,0), |
1053 | pci_resource_len(pci_dev,0)); | 1054 | pci_resource_len(pci_dev,0)); |
1055 | iounmap(bta->mmio); | ||
1054 | 1056 | ||
1055 | /* remove from linked list */ | 1057 | /* remove from linked list */ |
1056 | if (bta == btaudios) { | 1058 | if (bta == btaudios) { |