From 9f9df00accb343f61a5782904af10366a18ebb5a Mon Sep 17 00:00:00 2001 From: Jamie Iles Date: Wed, 14 Dec 2011 23:43:17 +0100 Subject: 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 Signed-off-by: Jamie Iles Signed-off-by: Russell King --- arch/arm/common/vic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/common/vic.c') diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c index 77287504c8b..dcb004a804c 100644 --- a/arch/arm/common/vic.c +++ b/arch/arm/common/vic.c @@ -197,8 +197,8 @@ static void __init vic_register(void __iomem *base, unsigned int irq, v->domain.nr_irq = 32; #ifdef CONFIG_OF_IRQ v->domain.of_node = of_node_get(node); - v->domain.ops = &irq_domain_simple_ops; #endif /* CONFIG_OF */ + v->domain.ops = &irq_domain_simple_ops; irq_domain_add(&v->domain); } -- cgit v1.2.3