[3/5] clocksource/drivers/timer-of: Checking for IS_ERR() instead of NULL

Message ID 1502461061-28065-3-git-send-email-daniel.lezcano@linaro.org
State Accepted
Commit 9e80dbd87286d3252ac2f78c6465c16e2ec8d476
Headers show
  • [1/5] clocksource/drivers/arm_arch_timer: Fix mem frame loop initialization
Related show

Commit Message

Daniel Lezcano Aug. 11, 2017, 2:17 p.m.
From: Dan Carpenter <dan.carpenter@oracle.com>

The current code checks the return value of the of_io_request_and_map()
function as it was returning a NULL pointer in case of error.

However, it returns an error code encoded in the pointer return value, not a
NULL value. Fix this by checking the returned pointer against IS_ERR() and
return the error with PTR_ERR().

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

 drivers/clocksource/timer-of.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c
index d509b50..4d7aef9 100644
--- a/drivers/clocksource/timer-of.c
+++ b/drivers/clocksource/timer-of.c
@@ -128,9 +128,9 @@  static __init int timer_base_init(struct device_node *np,
 	const char *name = of_base->name ? of_base->name : np->full_name;
 	of_base->base = of_io_request_and_map(np, of_base->index, name);
-	if (!of_base->base) {
+	if (IS_ERR(of_base->base)) {
 		pr_err("Failed to iomap (%s)\n", name);
-		return -ENXIO;
+		return PTR_ERR(of_base->base);
 	return 0;