[Linux-mips-commits]CVS: linux/arch/mips/vr4181/common irq.c,1.6,1.7

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr4181/common
In directory usw-pr-cvs1:/tmp/cvs-serv16408/vr4181/common

Modified Files:
	irq.c 
Log Message:
Interrupt handler fixes.

Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr4181/common/irq.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- irq.c	2001/10/07 16:57:19	1.6
+++ irq.c	2001/10/31 18:43:56	1.7
@@ -77,7 +77,13 @@
 
 #define sys_irq_shutdown	sys_irq_disable
 #define sys_irq_ack		sys_irq_disable
-#define sys_irq_end		sys_irq_enable
+
+static void
+sys_irq_end(unsigned int irq)
+{
+	if(!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
+		sys_irq_enable();
+}
 
 static hw_irq_controller sys_irq_controller = {
 	"vr4181_sys_irq",
@@ -148,7 +154,12 @@
 	}
 }
 
-#define gpio_irq_end		gpio_irq_enable
+static void
+gpio_irq_end(unsigned int irq)
+{
+	if(!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
+		gpio_irq_enable(irq);
+}
 
 static hw_irq_controller gpio_irq_controller = {
 	"vr4181_gpio_irq",