From: David S. Miller <davem@davemloft.net>
Date: Thu, 29 Jun 2006 21:38:21 +0000 (-0700)
Subject: [SPARC64]: Let irq_install_pre_handler() get called multiple times.
X-Git-Tag: v2.6.18-rc1~340
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=24ac26d425c96659b12cf16de7cbfe3bcbd73f05;p=linux-2.6-omap-h63xx.git

[SPARC64]: Let irq_install_pre_handler() get called multiple times.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index ab9e640df22..eebe02f3f4c 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -414,6 +414,10 @@ void irq_install_pre_handler(int virt_irq,
 	data->pre_handler_arg1 = arg1;
 	data->pre_handler_arg2 = arg2;
 
+	if (desc->chip == &sun4u_irq_ack ||
+	    desc->chip == &sun4v_irq_ack)
+		return;
+
 	desc->chip = (desc->chip == &sun4u_irq ?
 		      &sun4u_irq_ack : &sun4v_irq_ack);
 }