Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fca4edb4 authored by Amol Lad's avatar Amol Lad Committed by Linus Torvalds
Browse files

[PATCH] drivers/isdn: ioremap balanced with iounmap 



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

Signed-off-by: default avatarAmol Lad <amol@verismonetworks.com>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6220ec78

drivers/isdn/hisax/diva.c

+24 −2
Original line number Diff line number Diff line
@@ -716,7 +716,9 @@ release_io_diva(struct IsdnCardState *cs) 


		*cfg = 0; /* disable INT0/1 */ 

		*cfg = 2; /* reset pending INT0 */

		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) {
@@ -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);

		}

	}

drivers/isdn/hysdn/boardergo.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */