Pārlūkot izejas kodu

clocksource/drivers/mips-gic-timer: Fix an error code in 'gic_clocksource_of_init()'

'clk' is a valid pointer at this point. So calling PTR_ERR on it is
pointess.

Return the error code from 'clk_prepare_enable()' if it fails instead.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Christophe Jaillet 8 gadi atpakaļ
vecāks
revīzija
8c3ecd60e2
1 mainītis faili ar 3 papildinājumiem un 2 dzēšanām
  1. 3 2
      drivers/clocksource/mips-gic-timer.c

+ 3 - 2
drivers/clocksource/mips-gic-timer.c

@@ -167,10 +167,11 @@ static int __init gic_clocksource_of_init(struct device_node *node)
 
 	clk = of_clk_get(node, 0);
 	if (!IS_ERR(clk)) {
-		if (clk_prepare_enable(clk) < 0) {
+		ret = clk_prepare_enable(clk);
+		if (ret < 0) {
 			pr_err("GIC failed to enable clock\n");
 			clk_put(clk);
-			return PTR_ERR(clk);
+			return ret;
 		}
 
 		gic_frequency = clk_get_rate(clk);