From b4c8437b4e409af90e3cae884b554cb41eec18c1 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Mon, 3 Dec 2012 18:15:43 +0000 Subject: [PATCH] --- yaml --- r: 353917 b: refs/heads/master c: b652bd83a0528c43e935cb6f2f8df024b7a85c5e h: refs/heads/master i: 353915: c7c5e316a14ae4e8d7f7bafb7cc552a36a7b4171 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/addi_apci_2032.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index aa6fea21dccd..4008904dc002 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bf9a3babe630a9972b28fd3bb7d2cfcd40e6409 +refs/heads/master: b652bd83a0528c43e935cb6f2f8df024b7a85c5e diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c index aeb34dbe02a4..4c348dd2a5d5 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c +++ b/trunk/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;