Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e234b4a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5a77f025 32f2fea6

drivers/clocksource/timer-of.c

+10 −2
Original line number Original line Diff line number Diff line
@@ -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 timer_of *to = container_of(of_irq, struct timer_of, of_irq);

	struct clock_event_device *clkevt = &to->clkevt;

	struct clock_event_device *clkevt = &to->clkevt;





	of_irq->irq = of_irq->name ? of_irq_get_byname(np, of_irq->name):

	if (of_irq->name) {

		irq_of_parse_and_map(np, of_irq->index);

		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) {

	if (!of_irq->irq) {

		pr_err("Failed to map interrupt for %s\n", np->full_name);

		pr_err("Failed to map interrupt for %s\n", np->full_name);

		return -EINVAL;

		return -EINVAL;