| Message ID | 1467783323-16632-1-git-send-email-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 2016-07-06 at 07:35:23 +0200, Christophe JAILLET wrote: > 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> Sören
On Wed, Jul 06, 2016 at 07:35:23AM +0200, Christophe JAILLET wrote: > 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> Applied, thanks. -- Daniel
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);
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> --- drivers/clocksource/cadence_ttc_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)