lkml.org 
[lkml]   [2016]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] clocksource: timer-imx-gpt: Unmap and free region obtained by of_iomap and kzalloc
Date
Free memory and memory mapping, if mxc_timer_init_dt is not successful.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
drivers/clocksource/timer-imx-gpt.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index f595460..19f6860 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -489,12 +489,17 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t
return -ENOMEM;

imxtm->base = of_iomap(np, 0);
- if (!imxtm->base)
+ if (!imxtm->base) {
+ kfree(imxtm);
return -ENXIO;
+ }

imxtm->irq = irq_of_parse_and_map(np, 0);
- if (imxtm->irq <= 0)
+ if (imxtm->irq <= 0) {
+ iounmap(imxtm->base);
+ kfree(imxtm);
return -EINVAL;
+ }

imxtm->clk_ipg = of_clk_get_by_name(np, "ipg");

@@ -506,8 +511,11 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t
imxtm->type = type;

ret = _mxc_timer_init(imxtm);
- if (ret)
+ if (ret) {
+ iounmap(imxtm->base);
+ kfree(imxtm);
return ret;
+ }

initialized = 1;

--
2.7.4
\
 
 \ /
  Last update: 2016-09-23 00:02    [W:0.044 / U:1.532 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site