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

Commit 9f9df00a authored by Jamie Iles's avatar Jamie Iles Committed by Russell King
Browse files

ARM: 7236/1: vic: always use simple ops 



Now that irq_domain_simple_ops are available for non-DT users, use them
in the VIC driver so that we don't get a NULL dereference in
irq_domain_to_irq() when registering the domain.

Cc: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c87fb573

arch/arm/common/vic.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -197,8 +197,8 @@ static void __init vic_register(void __iomem *base, unsigned int irq, 
	v->domain.nr_irq = 32;

	v->domain.nr_irq = 32;

#ifdef CONFIG_OF_IRQ

#ifdef CONFIG_OF_IRQ

	v->domain.of_node = of_node_get(node);

	v->domain.of_node = of_node_get(node);

	v->domain.ops = &irq_domain_simple_ops;

#endif /* CONFIG_OF */

#endif /* CONFIG_OF */

	v->domain.ops = &irq_domain_simple_ops;

	irq_domain_add(&v->domain);

	irq_domain_add(&v->domain);

}

}