aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-01-09 14:19:18 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-09 14:19:18 -0500
commit16ed926eee5497db52fbee4d2db2dedbcd23561c (patch)
treeefb05ca279ef804c83160b3115f8cbbf09664091
parent0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (diff)
[ARM] Only call set_type method in setup_irq if it's defined
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/kernel/irq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index b5645c4462cf..1d50d2b98f55 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -710,7 +710,8 @@ int setup_irq(unsigned int irq, struct irqaction *new)
710 desc->pending = 0; 710 desc->pending = 0;
711 desc->disable_depth = 1; 711 desc->disable_depth = 1;
712 712
713 if (new->flags & SA_TRIGGER_MASK) { 713 if (new->flags & SA_TRIGGER_MASK &&
714 desc->chip->set_type) {
714 unsigned int type = new->flags & SA_TRIGGER_MASK; 715 unsigned int type = new->flags & SA_TRIGGER_MASK;
715 desc->chip->set_type(irq, type); 716 desc->chip->set_type(irq, type);
716 } 717 }