[patch] clocksource: timer-imx-gpt: make driver work again

From	Dan Carpenter <dan.carpenter@oracle.com>
Newsgroups	linux.kernel
Subject	[patch] clocksource: timer-imx-gpt: make driver work again
Date	2016-06-16 12:50 +0200
Message-ID	<rKD21-7fn-13@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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@oracle.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)

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[patch] clocksource: timer-imx-gpt: make driver work again Dan Carpenter <dan.carpenter@oracle.com> - 2016-06-16 12:50 +0200
  Re: [patch] clocksource: timer-imx-gpt: make driver work again Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-06-16 13:10 +0200

csiph-web