Skip to contentSkip to conversation

xirc2ps_cs.c got missed in the irqreturn_t swoop.

PATCH In review Simon Kelley 2 participants 2 messages May 13, 2003 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xirc2ps_cs.c got missed in the irqreturn_t swoop.

drivers/net/pcmcia/xirc2ps_cs.c Tue May 13 15:56:31 2003 renamed from drivers/net/pcmcia/xirc2ps_cs.c Mon May 5 00:53:13 2003 +5 -3
diff -urN linux-2.5.69.orig/drivers/net/pcmcia/xirc2ps_cs.c linux-2.5.69/drivers/net/pcmcia/xirc2ps_cs.c
@@ -317,7 +317,7 @@
  * less on other parts of the kernel.
  */
 
-static void xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 
 /*
  * The dev_info variable is the "key" that is used to match up this
@@ -1296,7 +1296,7 @@
 /****************
  * This is the Interrupt service route.
  */
-static void
+static irqreturn_t
 xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
     struct net_device *dev = (struct net_device *)dev_id;
@@ -1312,7 +1312,7 @@
                                  */
 
     if (!netif_device_present(dev))
-       return;
+       return IRQ_HANDLED;
 
     ioaddr = dev->base_addr;
     if (lp->mohawk) { /* must disable the interrupt */
@@ -1514,6 +1514,8 @@
      * force an interrupt with this command:
      *   PutByte(XIRCREG_CR, EnableIntr|ForceIntr);
      */
+
+    return IRQ_HANDLED;
 } /* xirc2ps_interrupt */
 
 /*====================================================================*/
#1 lore raw

It's already been done and currently in BK

Zwane

Signature · 1 line
function.linuxpower.ca