summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-12-14 23:43:17 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-03 15:17:29 +0000
commit9f9df00accb343f61a5782904af10366a18ebb5a (patch)
tree5146a38c6eda3f9f4ccec13d9bed5b21b1b04746
parentc87fb57346fc7653ace98769f148e0dcd88ac1ee (diff)
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: Jamie Iles <jamie@jamieiles.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/common/vic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 77287504c8b4..dcb004a804c7 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);
}