Commit-ID: 34c720a915857f168b98ab03f97b33784286e4ad
Gitweb: http://git.kernel.org/tip/34c720a915857f168b98ab03f97b33784286e4ad
Author: Christophe Jaillet <christophe.jaillet@xxxxxxxxxx>
AuthorDate: Wed, 6 Jul 2016 07:35:23 +0200
Committer: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
CommitDate: Thu, 7 Jul 2016 09:44:38 +0200
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@xxxxxxxxxx>
Acked-by: Sören Brinkmann <soren.brinkmann@xxxxxxxxxx>
---
drivers/clocksource/cadence_ttc_timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c
index 388a77b..fbfbdec 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)
clk_ce = of_clk_get(timer, clksel);
if (IS_ERR(clk_ce)) {
pr_err("ERROR: timer input clock not found\n");
- return PTR_ERR(clk_cs);
+ return PTR_ERR(clk_ce);
}
ret = ttc_setup_clocksource(clk_cs, timer_baseaddr, timer_width);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|