diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 20:19:18 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 20:19:18 +0100 |
commit | 16ed926eee5497db52fbee4d2db2dedbcd23561c (patch) | |
tree | efb05ca279ef804c83160b3115f8cbbf09664091 /arch/arm/kernel/irq.c | |
parent | Merge Linus' tree. (diff) | |
download | linux-16ed926eee5497db52fbee4d2db2dedbcd23561c.tar.xz linux-16ed926eee5497db52fbee4d2db2dedbcd23561c.zip |
[ARM] Only call set_type method in setup_irq if it's defined
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/irq.c')
-rw-r--r-- | arch/arm/kernel/irq.c | 3 |
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) desc->pending = 0; desc->disable_depth = 1; - if (new->flags & SA_TRIGGER_MASK) { + if (new->flags & SA_TRIGGER_MASK && + desc->chip->set_type) { unsigned int type = new->flags & SA_TRIGGER_MASK; desc->chip->set_type(irq, type); } |