diff mbox series

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

Message ID 1498555620-25094-5-git-send-email-daniel.lezcano@linaro.org
State Accepted
Commit 8c3ecd60e2ee6268e1735952e5b544f05b4dbb5a
Headers show
Series [1/5] clocksource/drivers/timer-of: Fix invalid iomap check | expand

Commit Message

Daniel Lezcano June 27, 2017, 9:27 a.m. UTC 
From: Christophe Jaillet <christophe.jaillet@wanadoo.fr>


'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>

---
 drivers/clocksource/mips-gic-timer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.7.4
diff mbox series

Patch

diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index e31e083..17b861e 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/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);