Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353916
b: refs/heads/master
c: 6bf9a3b
h: refs/heads/master
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent c7c5e31 commit 1978d7c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b82fe57c4d059a8ff1190ead1693d66b868353b2
refs/heads/master: 6bf9a3babe630a9972b28fd3bb7d2cfcd40e6409
6 changes: 4 additions & 2 deletions trunk/drivers/staging/comedi/drivers/addi_apci_2032.c
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,10 @@ static irqreturn_t apci2032_interrupt(int irq, void *d)
s->state = inl(dev->iobase + APCI2032_INT_STATUS_REG);
outl(0x0, dev->iobase + APCI2032_INT_CTRL_REG);

comedi_buf_put(s->async, s->state);
s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
if (comedi_buf_put(s->async, s->state))
s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
else
s->async->events |= COMEDI_CB_OVERFLOW;
comedi_event(dev, s);

return IRQ_HANDLED;
Expand Down

0 comments on commit 1978d7c

Please sign in to comment.