Skip to content

Commit

Permalink
[PATCH] ioremap balanced with iounmap for drivers/serial/8250_acorn,c
Browse files Browse the repository at this point in the history
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>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Amol Lad authored and Linus Torvalds committed Oct 1, 2006
1 parent 16c564b commit f12ad7d
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/serial/8250_acorn.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ struct serial_card_type {
struct serial_card_info {
unsigned int num_ports;
int ports[MAX_PORTS];
void __iomem *vaddr;
};

static int __devinit
Expand All @@ -44,7 +45,6 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
struct serial_card_type *type = id->data;
struct uart_port port;
unsigned long bus_addr;
unsigned char __iomem *virt_addr;
unsigned int i;

info = kmalloc(sizeof(struct serial_card_info), GFP_KERNEL);
Expand All @@ -55,8 +55,8 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
info->num_ports = type->num_ports;

bus_addr = ecard_resource_start(ec, type->type);
virt_addr = ioremap(bus_addr, ecard_resource_len(ec, type->type));
if (!virt_addr) {
info->vaddr = ioremap(bus_addr, ecard_resource_len(ec, type->type));
if (!info->vaddr) {
kfree(info);
return -ENOMEM;
}
Expand All @@ -72,7 +72,7 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
port.dev = &ec->dev;

for (i = 0; i < info->num_ports; i ++) {
port.membase = virt_addr + type->offset[i];
port.membase = info->vaddr + type->offset[i];
port.mapbase = bus_addr + type->offset[i];

info->ports[i] = serial8250_register_port(&port);
Expand All @@ -92,6 +92,7 @@ static void __devexit serial_card_remove(struct expansion_card *ec)
if (info->ports[i] > 0)
serial8250_unregister_port(info->ports[i]);

iounmap(info->vaddr);
kfree(info);
}

Expand Down

0 comments on commit f12ad7d

Please sign in to comment.