[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <160119884544.7002.7992233387160286791.tip-bot2@tip-bot2>
Date: Sun, 27 Sep 2020 09:27:25 -0000
From: "tip-bot2 for Tianjia Zhang" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Daniel Lezcano <daniel.lezcano@...aro.org>,
Tianjia Zhang <tianjia.zhang@...ux.alibaba.com>,
x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org>
Subject: [tip: timers/urgent] clocksource/drivers/h8300_timer8: Fix wrong
return value in h8300_8timer_init()
The following commit has been merged into the timers/urgent branch of tip:
Commit-ID: 400d033f5a599120089b5f0c54d14d198499af5a
Gitweb: https://git.kernel.org/tip/400d033f5a599120089b5f0c54d14d198499af5a
Author: Tianjia Zhang <tianjia.zhang@...ux.alibaba.com>
AuthorDate: Sun, 02 Aug 2020 19:15:41 +08:00
Committer: Daniel Lezcano <daniel.lezcano@...aro.org>
CommitterDate: Mon, 24 Aug 2020 13:01:38 +02:00
clocksource/drivers/h8300_timer8: Fix wrong return value in h8300_8timer_init()
In the init function, if the call to of_iomap() fails, the return
value is ENXIO instead of -ENXIO.
Change to the right negative errno.
Fixes: 691f8f878290f ("clocksource/drivers/h8300_timer8: Convert init function to return error")
Cc: Daniel Lezcano <daniel.lezcano@...aro.org>
Signed-off-by: Tianjia Zhang <tianjia.zhang@...ux.alibaba.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@...aro.org>
Link: https://lore.kernel.org/r/20200802111541.5429-1-tianjia.zhang@linux.alibaba.com
---
drivers/clocksource/h8300_timer8.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/h8300_timer8.c b/drivers/clocksource/h8300_timer8.c
index 1d740a8..47114c2 100644
--- a/drivers/clocksource/h8300_timer8.c
+++ b/drivers/clocksource/h8300_timer8.c
@@ -169,7 +169,7 @@ static int __init h8300_8timer_init(struct device_node *node)
return PTR_ERR(clk);
}
- ret = ENXIO;
+ ret = -ENXIO;
base = of_iomap(node, 0);
if (!base) {
pr_err("failed to map registers for clockevent\n");
Powered by blists - more mailing lists