Commit be618f55 authored by Amol Lad's avatar Amol Lad Committed by Linus Torvalds

[PATCH] ioremap balanced with iounmap for drivers/serial/mpc52xx_uart.c

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>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6257b3bd
...@@ -338,14 +338,23 @@ mpc52xx_uart_release_port(struct uart_port *port) ...@@ -338,14 +338,23 @@ mpc52xx_uart_release_port(struct uart_port *port)
static int static int
mpc52xx_uart_request_port(struct uart_port *port) mpc52xx_uart_request_port(struct uart_port *port)
{ {
int err;
if (port->flags & UPF_IOREMAP) /* Need to remap ? */ if (port->flags & UPF_IOREMAP) /* Need to remap ? */
port->membase = ioremap(port->mapbase, MPC52xx_PSC_SIZE); port->membase = ioremap(port->mapbase, MPC52xx_PSC_SIZE);
if (!port->membase) if (!port->membase)
return -EINVAL; return -EINVAL;
return request_mem_region(port->mapbase, MPC52xx_PSC_SIZE, err = request_mem_region(port->mapbase, MPC52xx_PSC_SIZE,
"mpc52xx_psc_uart") != NULL ? 0 : -EBUSY; "mpc52xx_psc_uart") != NULL ? 0 : -EBUSY;
if (err && (port->flags & UPF_IOREMAP)) {
iounmap(port->membase);
port->membase = NULL;
}
return err;
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment