Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar:
"A timer_irq_init() clocksource API robustness fix"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/drivers/timer-of: Handle of_irq_get_byname() result correctly
+10
-2
+10
-2
drivers/clocksource/timer-of.c
+10
-2
drivers/clocksource/timer-of.c
···
41
41
struct timer_of *to = container_of(of_irq, struct timer_of, of_irq);
42
42
struct clock_event_device *clkevt = &to->clkevt;
43
43
44
-
of_irq->irq = of_irq->name ? of_irq_get_byname(np, of_irq->name):
45
-
irq_of_parse_and_map(np, of_irq->index);
44
+
if (of_irq->name) {
45
+
of_irq->irq = ret = of_irq_get_byname(np, of_irq->name);
46
+
if (ret < 0) {
47
+
pr_err("Failed to get interrupt %s for %s\n",
48
+
of_irq->name, np->full_name);
49
+
return ret;
50
+
}
51
+
} else {
52
+
of_irq->irq = irq_of_parse_and_map(np, of_irq->index);
53
+
}
46
54
if (!of_irq->irq) {
47
55
pr_err("Failed to map interrupt for %s\n", np->full_name);
48
56
return -EINVAL;