diff options
| author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2015-09-20 10:00:10 -0400 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2015-09-29 08:33:34 -0400 |
| commit | ccc42592d436d021d17f86729d24806f30dbad25 (patch) | |
| tree | 04c7f7c56ca164ad10cf93c8eac2d03f1c05016d | |
| parent | eef7635a22f6b144206b5ca2f1398f637acffc4d (diff) | |
clocksource/drivers/rockchip: Fix bad NO_IRQ usage
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>
| -rw-r--r-- | drivers/clocksource/rockchip_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c index bb2c2b050964..d3c1742ded1a 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) | |||
| 148 | bc_timer.freq = clk_get_rate(timer_clk); | 148 | bc_timer.freq = clk_get_rate(timer_clk); |
| 149 | 149 | ||
| 150 | irq = irq_of_parse_and_map(np, 0); | 150 | irq = irq_of_parse_and_map(np, 0); |
| 151 | if (irq == NO_IRQ) { | 151 | if (!irq) { |
| 152 | pr_err("Failed to map interrupts for '%s'\n", TIMER_NAME); | 152 | pr_err("Failed to map interrupts for '%s'\n", TIMER_NAME); |
| 153 | return; | 153 | return; |
| 154 | } | 154 | } |
