timer-of: handle of_irq_get_byname() result correctly
PATCH v2 1/1 timer-of: handle of_irq_get_byname() result correctly
of_irq_get_byname() may return a negative error number as well as 0 on failure, while timer_irq_init() only checks for 0, blithely continuing with the call to request_[percpu_]irq() -- those functions expect *unsigned int*, so would probably fail anyway when a large IRQ number resulting from a conversion of a negative error number is passed to them... This, however, is incorrect behavior -- error number is not IRQ number.
Filter out the negative error numbers, complain, and return them to the timer_irq_init()'s callers...
---
The patch is against the 'tip.git' repo's 'timers/core' branch.
Changes in version 2:
- fix the function name in the subject;
- fix the fat-fingered word in the description.
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 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 ;
tip-bot for Sergei Shtylyov
merge bot[tip:timers/urgent] clocksource/drivers/timer-of: Handle of_irq_get_byname() result correctly
clocksource/drivers/timer-of: Handle of_irq_get_byname() result correctly
Commit-ID: 32f2fea6e77e64cd4045ec2d5deb879aada3b476 Gitweb: http://git.kernel.org/tip/32f2fea6e77e64cd4045ec2d5deb879aada3b476 Author: Sergei Shtylyov <[email protected]> AuthorDate: Mon, 17 Jul 2017 21:00:44 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 17 Jul 2017 22:43:00 +0200
clocksource/drivers/timer-of: Handle of_irq_get_byname() result correctly
of_irq_get_byname() may return a negative error number as well as 0 on failure, while timer_irq_init() only checks for 0, blithely continuing with the call to request_[percpu_]irq() -- those functions expect *unsigned int*, so would probably fail anyway when a large IRQ number resulting from a conversion of a negative error number is passed to them... This, however, is incorrect behavior -- error number is not IRQ number.
Filter out the negative error numbers, complain, and return them to the timer_irq_init()'s callers...
--- 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 ;