From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 9 Jan 2006 19:19:18 +0000 (+0000)
Subject: [ARM] Only call set_type method in setup_irq if it's defined
X-Git-Tag: v2.6.16-rc1~660^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16ed926eee5497db52fbee4d2db2dedbcd23561c;p=linux-2.6

[ARM] Only call set_type method in setup_irq if it's defined

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index b5645c4462..1d50d2b98f 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);
 		}