AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] drivers/isdn: ioremap balanced with iounmap

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

Signed-off-by: Amol Lad <amol@verismonetworks.com>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Amol Lad 2006-10-19 23:29:06 -07:00 committed by Linus Torvalds
parent 6220ec7844
commit fca4edb48b
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/isdn/hisax/diva.c
View File

@ -716,8 +716,10 @@ release_io_diva(struct IsdnCardState *cs)
*cfg = 0; /* disable INT0/1 */
*cfg = 2; /* reset pending INT0 */
iounmap((void *)cs->hw.diva.cfg_reg);
iounmap((void *)cs->hw.diva.pci_cfg);
if (cs->hw.diva.cfg_reg)
iounmap((void *)cs->hw.diva.cfg_reg);
if (cs->hw.diva.pci_cfg)
iounmap((void *)cs->hw.diva.pci_cfg);
return;
} else if (cs->subtyp != DIVA_IPAC_ISA) {
del_timer(&cs->hw.diva.tl);
@ -733,6 +735,23 @@ release_io_diva(struct IsdnCardState *cs)
}
}
static void
iounmap_diva(struct IsdnCardState *cs)
{
if ((cs->subtyp == DIVA_IPAC_PCI) || (cs->subtyp == DIVA_IPACX_PCI)) {
if (cs->hw.diva.cfg_reg) {
iounmap((void *)cs->hw.diva.cfg_reg);
cs->hw.diva.cfg_reg = 0;
}
if (cs->hw.diva.pci_cfg) {
iounmap((void *)cs->hw.diva.pci_cfg);
cs->hw.diva.pci_cfg = 0;
}
}
return;
}
static void
reset_diva(struct IsdnCardState *cs)
{
@ -1069,11 +1088,13 @@ setup_diva(struct IsdnCard *card)
if (!cs->irq) {
printk(KERN_WARNING "Diva: No IRQ for PCI card found\n");
iounmap_diva(cs);
return(0);
}
if (!cs->hw.diva.cfg_reg) {
printk(KERN_WARNING "Diva: No IO-Adr for PCI card found\n");
iounmap_diva(cs);
return(0);
}
cs->irq_flags |= IRQF_SHARED;
@ -1123,6 +1144,7 @@ setup_diva(struct IsdnCard *card)
CardType[card->typ],
cs->hw.diva.cfg_reg,
cs->hw.diva.cfg_reg + bytecnt);
iounmap_diva(cs);
return (0);
}
}

2
drivers/isdn/hysdn/boardergo.c
View File

@ -403,7 +403,7 @@ ergo_releasehardware(hysdn_card * card)
free_irq(card->irq, card); /* release interrupt */
release_region(card->iobase + PCI9050_INTR_REG, 1); /* release all io ports */
release_region(card->iobase + PCI9050_USER_IO, 1);
vfree(card->dpram);
iounmap(card->dpram);
card->dpram = NULL; /* release shared mem */
} /* ergo_releasehardware */