summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmol Lad <amol@verismonetworks.com>2006-10-01 10:29:21 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 11:39:32 +0400
commitf4664132613caf40bfbf17b7e0ab3340a8b8f526 (patch)
tree19de52077caafb9e0883418b8f95c8cb5301c577
parentd9964d5c9067fe58fecb7ba10b2de4771d2005d9 (diff)
downloadlinux-f4664132613caf40bfbf17b7e0ab3340a8b8f526.tar.xz
[PATCH] ioremap balanced with iounmap for drivers/serial/ioc4_serial.c
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> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Brent Casavant <bcasavan@sgi.com> Cc: Pat Gefre <pfg@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/serial/ioc4_serial.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index 576ca1eaa2b6..5ec4716c99bf 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -2685,6 +2685,7 @@ static int ioc4_serial_remove_one(struct ioc4_driver_data *idd)
if (soft) {
free_irq(control->ic_irq, soft);
if (soft->is_ioc4_serial_addr) {
+ iounmap(soft->is_ioc4_serial_addr);
release_region((unsigned long)
soft->is_ioc4_serial_addr,
sizeof(struct ioc4_serial));
@@ -2887,6 +2888,8 @@ out4:
out3:
kfree(control);
out2:
+ if (serial)
+ iounmap(serial);
release_region(tmp_addr1, sizeof(struct ioc4_serial));
out1: