Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1236007

[PATCH 1/2] clocksource/drivers/rockchip: Fix bad NO_IRQ usage

Show all headers | View raw

The current code assumes the 'irq_of_parse_and_map' will return NO_IRQ in case
of failure. Unfortunately, the NO_IRQ is not consistent across the different
architectures and we must not rely on it.

NO_IRQ is equal to '-1' on ARM and 'irq_of_parse_and_map' returns '0' in case
of an error. Hence, the latter won't be detected and will lead to a crash.

Fix this by just checking 'irq' is different from zero.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/clocksource/rockchip_timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c
index bb2c2b0..d3c1742 100644
--- a/drivers/clocksource/rockchip_timer.c
+++ b/drivers/clocksource/rockchip_timer.c
@@ -148,7 +148,7 @@ static void __init rk_timer_init(struct device_node *np)
 	bc_timer.freq = clk_get_rate(timer_clk);
 
 	irq = irq_of_parse_and_map(np, 0);
-	if (irq == NO_IRQ) {
+	if (!irq) {
 		pr_err("Failed to map interrupts for '%s'\n", TIMER_NAME);
 		return;
 	}
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL] clockevents: a couple of fixes 4.3 Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-09-30 12:10 +0200
  [PATCH 2/2] clocksource/drivers/keystone: Fix bad NO_IRQ usage Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-09-30 12:10 +0200
    Re: [PATCH 2/2] clocksource/drivers/keystone: Fix bad NO_IRQ usage santosh shilimkar <santosh.shilimkar@oracle.com> - 2015-09-30 17:30 +0200
  [PATCH 1/2] clocksource/drivers/rockchip: Fix bad NO_IRQ usage Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-09-30 12:10 +0200
    Re: [PATCH 1/2] clocksource/drivers/rockchip: Fix bad NO_IRQ usage Caesar Wang <caesar.upstream@gmail.com> - 2015-09-30 12:20 +0200

csiph-web