aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-07-17 01:34:09 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-26 19:04:50 -0400
commit195be84aaae50af84c833d91c81af015091ec86d (patch)
tree1159d446e5326aa73f5d9fe8de3fad3cbfe720e2
parent37e1ceb1796279d8a7b0dfaeff8a829d1dd1b2f3 (diff)
msm_serial: add missing iounmap() on error in msm_request_port()
Add the missing iounmap() before return from msm_request_port() in the error handling case. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Reviewed-by: Ivan T. Ivanov <iivanov@mm-sol.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/msm_serial.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 2c6cfb3cf032..0b38b288ed5b 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -637,7 +637,7 @@ static int msm_request_port(struct uart_port *port)
637 if (!request_mem_region(gsbi_resource->start, size, 637 if (!request_mem_region(gsbi_resource->start, size,
638 "msm_serial")) { 638 "msm_serial")) {
639 ret = -EBUSY; 639 ret = -EBUSY;
640 goto fail_release_port; 640 goto fail_release_port_membase;
641 } 641 }
642 642
643 msm_port->gsbi_base = ioremap(gsbi_resource->start, size); 643 msm_port->gsbi_base = ioremap(gsbi_resource->start, size);
@@ -651,6 +651,8 @@ static int msm_request_port(struct uart_port *port)
651 651
652fail_release_gsbi: 652fail_release_gsbi:
653 release_mem_region(gsbi_resource->start, size); 653 release_mem_region(gsbi_resource->start, size);
654fail_release_port_membase:
655 iounmap(port->membase);
654fail_release_port: 656fail_release_port:
655 release_mem_region(port->mapbase, size); 657 release_mem_region(port->mapbase, size);
656 return ret; 658 return ret;