commit 24ac26d425c96659b12cf16de7cbfe3bcbd73f05
author David S. Miller <davem@davemloft.net> Thu Jun 29 14:38:21 2006 -0700
committer David S. Miller <davem@sunset.davemloft.net> Thu Jun 29 16:37:27 2006 -0700
tree 6e2cbfad38d3f167dfa5b53b75f9e0ba1fb3ae83
parent 946ea09962a56674fe564b41c3007933bb41a068

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

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

arch/sparc64/kernel/irq.c

diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index ab9e640..eebe02f 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -414,6 +414,10 @@
 	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);
 }