aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/comedi/drivers/addi_apci_2032.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c
index aeb34dbe02a..4c348dd2a5d 100644
--- a/drivers/staging/comedi/drivers/addi_apci_2032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -159,7 +159,7 @@ static int apci2032_int_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
- data[1] = s->state;
+ data[1] = inl(dev->iobase + APCI2032_INT_STATUS_REG) & 3;
return insn->n;
}
@@ -245,10 +245,10 @@ static irqreturn_t apci2032_interrupt(int irq, void *d)
if (!val)
return IRQ_NONE;
- s->state = inl(dev->iobase + APCI2032_INT_STATUS_REG);
- outl(0x0, dev->iobase + APCI2032_INT_CTRL_REG);
+ val = inl(dev->iobase + APCI2032_INT_STATUS_REG) & 3;
+ outl(0x00, dev->iobase + APCI2032_INT_CTRL_REG);
- if (comedi_buf_put(s->async, s->state))
+ if (comedi_buf_put(s->async, val))
s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
else
s->async->events |= COMEDI_CB_OVERFLOW;