From: Steven Rostedt <rostedt@goodmis.org>

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/irq/spurious.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN kernel/irq/spurious.c~genirq-add-irq-chip-support-misroute-irq-dont-call-desc-chip-end kernel/irq/spurious.c
--- devel/kernel/irq/spurious.c~genirq-add-irq-chip-support-misroute-irq-dont-call-desc-chip-end	2006-06-09 15:23:01.000000000 -0700
+++ devel-akpm/kernel/irq/spurious.c	2006-06-09 15:23:01.000000000 -0700
@@ -79,7 +79,7 @@ static int misrouted_irq(int irq, struct
 		 * If we did actual work for the real IRQ line we must let the
 		 * IRQ controller clean up too
 		 */
-		if (work)
+		if (work && desc->chip && desc->chip->end)
 			desc->chip->end(i);
 		spin_unlock(&desc->lock);
 	}
_