aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Jaillet <christophe.jaillet@wanadoo.fr>2016-07-06 01:35:23 -0400
committerDaniel Lezcano <daniel.lezcano@linaro.org>2016-07-07 03:44:38 -0400
commit34c720a915857f168b98ab03f97b33784286e4ad (patch)
treecec02aa403f8c238a3dc680b1bb952738d384bb2
parent46fd5c6b3059462131caa4d52691c9c5666c3223 (diff)
clocksource/drivers/cadence_ttc: fix a return value in case of error
IS_ERR and PTR_ERR should use the same variable, clk_ce in this case. Fixes: 4de1eb07c47f (Convert init function to return error) Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
-rw-r--r--drivers/clocksource/cadence_ttc_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c
index 388a77bdc39a..fbfbdec13b08 100644
--- a/drivers/clocksource/cadence_ttc_timer.c
+++ b/drivers/clocksource/cadence_ttc_timer.c
@@ -523,7 +523,7 @@ static int __init ttc_timer_init(struct device_node *timer)
523 clk_ce = of_clk_get(timer, clksel); 523 clk_ce = of_clk_get(timer, clksel);
524 if (IS_ERR(clk_ce)) { 524 if (IS_ERR(clk_ce)) {
525 pr_err("ERROR: timer input clock not found\n"); 525 pr_err("ERROR: timer input clock not found\n");
526 return PTR_ERR(clk_cs); 526 return PTR_ERR(clk_ce);
527 } 527 }
528 528
529 ret = ttc_setup_clocksource(clk_cs, timer_baseaddr, timer_width); 529 ret = ttc_setup_clocksource(clk_cs, timer_baseaddr, timer_width);