public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: tglx@linutronix.de, mingo@kernel.org
Cc: dingtianhong@huawei.com, matt.redfearn@imgtec.com,
	dan.carpenter@oracle.com, garsilva@embeddedor.com,
	mka@chromium.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/5] clocksource/drivers/timer-of: Checking for IS_ERR() instead of NULL
Date: Fri, 11 Aug 2017 16:17:39 +0200	[thread overview]
Message-ID: <1502461061-28065-3-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1502461061-28065-1-git-send-email-daniel.lezcano@linaro.org>

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;
-- 
2.7.4

  parent reply	other threads:[~2017-08-11 14:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-11 14:15 Daniel Lezcano
2017-08-11 14:16 ` [GIT PULL] clockevents: fixes for 4.13-rc4 Daniel Lezcano
2017-08-11 18:43   ` Linus Torvalds
2017-08-11 21:44     ` Daniel Lezcano
2017-08-11 22:57       ` Linus Torvalds
2017-08-11 23:30       ` Ingo Molnar
2017-08-11 14:17 ` [PATCH 1/5] clocksource/drivers/arm_arch_timer: Fix mem frame loop initialization Daniel Lezcano
2017-08-11 14:17   ` [PATCH 2/5] clocksource/drivers/em_sti: Fix error return codes in em_sti_probe() Daniel Lezcano
2017-08-11 14:17   ` Daniel Lezcano [this message]
2017-08-11 14:17   ` [PATCH 4/5] clocksource/drivers/Kconfig: Fix CLKSRC_PISTACHIO dependencies Daniel Lezcano
2017-08-11 14:17   ` [PATCH 5/5] clocksource/drivers/arm_arch_timer: Avoid infinite recursion when ftrace is enabled Daniel Lezcano
2017-08-13  9:42 ` [GIT PULL] clockevents: fixes for 4.13-rc4 Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1502461061-28065-3-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=dan.carpenter@oracle.com \
    --cc=dingtianhong@huawei.com \
    --cc=garsilva@embeddedor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matt.redfearn@imgtec.com \
    --cc=mingo@kernel.org \
    --cc=mka@chromium.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox