timer fix
Linus,
Please pull the latest timers-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus
# HEAD: 32f2fea6e77e64cd4045ec2d5deb879aada3b476 clocksource/drivers/timer-of: Handle of_irq_get_byname() result correctly
A timer_irq_init() clocksource API robustness fix.
Thanks,
Ingo
------------------>
Sergei Shtylyov (1):
clocksource/drivers/timer-of: Handle of_irq_get_byname() result correctly
drivers/clocksource/timer-of.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/clocksource/timer-of.c +10 -2
@@ -41,8 +41,16 @@ static __init int timer_irq_init(struct device_node *np, struct timer_of *to = container_of(of_irq, struct timer_of, of_irq);struct clock_event_device *clkevt = &to->clkevt; - of_irq->irq = of_irq->name ?of_irq_get_byname (np, of_irq->name): -irq_of_parse_and_map (np, of_irq->index); +if (of_irq->name) { + of_irq->irq = ret =of_irq_get_byname (np, of_irq->name); +if (ret <0 ) { +pr_err ("Failed to get interrupt %s for %s\n" , + of_irq->name, np->full_name); +return ret; + } + }else { + of_irq->irq =irq_of_parse_and_map (np, of_irq->index); + }if (!of_irq->irq) {pr_err ("Failed to map interrupt for %s\n" , np->full_name);return -EINVAL ;