[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20160616104225.GA24067@mwanda>
Date: Thu, 16 Jun 2016 13:42:25 +0300
From: Dan Carpenter <dan.carpenter@...cle.com>
To: Daniel Lezcano <daniel.lezcano@...aro.org>
Cc: Thomas Gleixner <tglx@...utronix.de>, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org
Subject: [patch] clocksource: timer-imx-gpt: make driver work again
We accidentally made mxc_timer_init_dt() return unconditionally.
Fixes: e93432390ec1 ('clocksource/drivers/timer-imx-gpt: Convert init function to return error')
Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com>
diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 5f64dff..f595460 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -485,7 +485,8 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t
return 0;
imxtm = kzalloc(sizeof(*imxtm), GFP_KERNEL);
- return -ENOMEM;
+ if (!imxtm)
+ return -ENOMEM;
imxtm->base = of_iomap(np, 0);
if (!imxtm->base)
Powered by blists - more mailing lists