lkml.org 
[lkml]   [2004]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
Subject[PATCH 2.6 IrDA] irq_retval_smsc2-fix (resent)
From
irXXX_irq_retval_smsc2-fix.diff :
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
<Patch from Stephen Hemminger>
o [CORRECT] Fix the handling of shared IRQs in smsc-ircc2 driver.


diff -Nru a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
--- a/drivers/net/irda/smsc-ircc2.c Tue Feb 24 11:17:34 2004
+++ b/drivers/net/irda/smsc-ircc2.c Tue Feb 24 11:17:34 2004
@@ -1385,11 +1385,12 @@
struct net_device *dev = (struct net_device *) dev_id;
struct smsc_ircc_cb *self;
int iobase, iir, lcra, lsr;
+ irqreturn_t ret = IRQ_NONE;

if (dev == NULL) {
printk(KERN_WARNING "%s: irq %d for unknown device.\n",
driver_name, irq);
- return IRQ_NONE;
+ goto irq_ret;
}
self = (struct smsc_ircc_cb *) dev->priv;
ASSERT(self != NULL, return IRQ_NONE;);
@@ -1399,14 +1400,18 @@

/* Check if we should use the SIR interrupt handler */
if (self->io.speed <= SMSC_IRCC2_MAX_SIR_SPEED) {
- irqreturn_t ret = smsc_ircc_interrupt_sir(dev);
- spin_unlock(&self->lock);
- return ret;
+ ret = smsc_ircc_interrupt_sir(dev);
+ goto irq_ret_unlock;
}
+
iobase = self->io.fir_base;

register_bank(iobase, 0);
iir = inb(iobase+IRCC_IIR);
+ if (iir == 0)
+ goto irq_ret_unlock;
+ ret = IRQ_HANDLED;
+
/* Disable interrupts */
outb(0, iobase+IRCC_IER);
lcra = inb(iobase+IRCC_LCR_A);
@@ -1432,8 +1437,10 @@
register_bank(iobase, 0);
outb(IRCC_IER_ACTIVE_FRAME|IRCC_IER_EOM, iobase+IRCC_IER);

+ irq_ret_unlock:
spin_unlock(&self->lock);
- return IRQ_RETVAL(iir);
+ irq_ret:
+ return ret;
}

/*
@@ -1454,6 +1461,8 @@
iobase = self->io.sir_base;

iir = inb(iobase+UART_IIR) & UART_IIR_ID;
+ if (iir == 0)
+ return IRQ_NONE;
while (iir) {
/* Clear interrupt */
lsr = inb(iobase+UART_LSR);
@@ -1487,7 +1496,7 @@
iir = inb(iobase + UART_IIR) & UART_IIR_ID;
}
/*spin_unlock(&self->lock);*/
- return IRQ_RETVAL(iir);
+ return IRQ_HANDLED;
}


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:01    [W:0.212 / U:0.028 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site