Skip to contentSkip to conversation

sound/oss/btaudio.c: ioremap balanced with iounmap

PATCH In review Amol Lad 2 participants 2 messages Oct 6, 2006 Sound

lore
Share & tools
lore

Amol Lad

author
#0 lore raw

PATCH 1/9 sound/oss/btaudio.c: ioremap balanced with iounmap

ioremap must be balanced by an iounmap and failing to do so can result in a memory leak.

Tested (compilation only):
- using allmodconfig
- making sure the files are compiling without any warning/error due to new changes

---
Forwarding to lkml as got no response from linux-sound

---
 btaudio.c |    2 ++
 1 files changed, 2 insertions(+)

---

sound/oss/btaudio.c +2 -0
diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdiff linux-2.6.19-rc1-orig/sound/oss/btaudio.c linux-2.6.19-rc1/sound/oss/btaudio.c
@@ -1013,6 +1013,7 @@ static int __devinit btaudio_probe(struc
         return 0;
 
  fail4:
+	iounmap(bta->mmio);
 	unregister_sound_dsp(bta->dsp_analog);
  fail3:
 	if (digital)
@@ -1051,6 +1052,7 @@ static void __devexit btaudio_remove(str
         free_irq(bta->irq,bta);
 	release_mem_region(pci_resource_start(pci_dev,0),
 			   pci_resource_len(pci_dev,0));
+	iounmap(bta->mmio);
 
 	/* remove from linked list */
 	if (bta == btaudios) {
#1 lore raw
Quoted 27 lines · On Fri, 06 Oct 2006 11:08:52 +0530 Amol Lad <[email protected]> wrote:

ioremap must be balanced by an iounmap and failing to do so can result in a memory leak.

Tested (compilation only):
- using allmodconfig
- making sure the files are compiling without any warning/error due to new changes

---
Forwarding to lkml as got no response from linux-sound

---
 btaudio.c |    2 ++
 1 files changed, 2 insertions(+)

---
diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdiff linux-2.6.19-rc1-orig/sound/oss/btaudio.c linux-2.6.19-rc1/sound/oss/btaudio.c

sound/oss/btaudio.c +1 -0
@@ -1013,6 +1013,7 @@ static int __devinit btaudio_probe(struc
         return 0;
 
  fail4:
+	iounmap(bta->mmio);
 	unregister_sound_dsp(bta->dsp_analog);
  fail3:
 	if (digital)

sound/oss/btaudio.c static void __devexit btaudio_remove(str · line 1058

Quoted 7 lines
sound/oss/btaudio.c +1 -0
@@ -1051,6 +1052,7 @@ static void __devexit btaudio_remove(str
         free_irq(bta->irq,bta);
 	release_mem_region(pci_resource_start(pci_dev,0),
 			   pci_resource_len(pci_dev,0));
+	iounmap(bta->mmio);
 
 	/* remove from linked list */
 	if (bta == btaudios) {

No, that misses several cases. Please review this version:

sound/oss/btaudio.c renamed from sound/oss/btaudio.c~sound-oss-btaudioc-ioremap-balanced-with-iounmap +2 -0
@@ -1020,6 +1020,7 @@ static int __devinit btaudio_probe(struc
  fail2:
         free_irq(bta->irq,bta);	
  fail1:
+	iounmap(bta->mmio);
 	kfree(bta);
  fail0:
 	release_mem_region(pci_resource_start(pci_dev,0),
@@ -1051,6 +1052,7 @@ static void __devexit btaudio_remove(str
         free_irq(bta->irq,bta);
 	release_mem_region(pci_resource_start(pci_dev,0),
 			   pci_resource_len(pci_dev,0));
+	iounmap(bta->mmio);
 
 	/* remove from linked list */
 	if (bta == btaudios) {

_