From 9a44ce45e42cd04b4792baa01e0e57a7e962da79 Mon Sep 17 00:00:00 2001 From: Amol Lad Date: Sat, 30 Sep 2006 23:29:24 -0700 Subject: [PATCH] --- yaml --- r: 37726 b: refs/heads/master c: a141a04330bd6eadf7081a0860dc786be7d09c46 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/mpsc.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5c898501b127..8549eec81373 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be618f550cb499db263e2ce22c5ad4f4dbfd53e6 +refs/heads/master: a141a04330bd6eadf7081a0860dc786be7d09c46 diff --git a/trunk/drivers/serial/mpsc.c b/trunk/drivers/serial/mpsc.c index 63d2a66e563b..704243c9f78a 100644 --- a/trunk/drivers/serial/mpsc.c +++ b/trunk/drivers/serial/mpsc.c @@ -1893,6 +1893,10 @@ mpsc_drv_map_regs(struct mpsc_port_info *pi, struct platform_device *pd) } else { mpsc_resource_err("SDMA base"); + if (pi->mpsc_base) { + iounmap(pi->mpsc_base); + pi->mpsc_base = NULL; + } return -ENOMEM; } @@ -1905,6 +1909,14 @@ mpsc_drv_map_regs(struct mpsc_port_info *pi, struct platform_device *pd) } else { mpsc_resource_err("BRG base"); + if (pi->mpsc_base) { + iounmap(pi->mpsc_base); + pi->mpsc_base = NULL; + } + if (pi->sdma_base) { + iounmap(pi->sdma_base); + pi->sdma_base = NULL; + } return -ENOMEM; }