| Message ID | 1443607710-10415-2-git-send-email-daniel.lezcano@linaro.org |
|---|---|
| State | Accepted |
| Commit | bdf7344e14d826d0df438a55fc51146d179e198d |
| Headers | show |
On 9/30/2015 3:08 AM, Daniel Lezcano wrote: > 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/timer-keystone.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Acked-by: Santosh Shilimkar <ssantosh@kernel.org> -- 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/
diff --git a/drivers/clocksource/timer-keystone.c b/drivers/clocksource/timer-keystone.c index edacf39..1cea08c 100644 --- a/drivers/clocksource/timer-keystone.c +++ b/drivers/clocksource/timer-keystone.c @@ -152,7 +152,7 @@ static void __init keystone_timer_init(struct device_node *np) int irq, error; irq = irq_of_parse_and_map(np, 0); - if (irq == NO_IRQ) { + if (!irq) { pr_err("%s: failed to map interrupts\n", __func__); return; }
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/timer-keystone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)