From 1978d7c7cc645e57a0a91e0e8f29052bf8c41766 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Mon, 3 Dec 2012 18:15:42 +0000 Subject: [PATCH] --- yaml --- r: 353916 b: refs/heads/master c: 6bf9a3babe630a9972b28fd3bb7d2cfcd40e6409 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/addi_apci_2032.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7cf5349ddf3f..aa6fea21dccd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b82fe57c4d059a8ff1190ead1693d66b868353b2 +refs/heads/master: 6bf9a3babe630a9972b28fd3bb7d2cfcd40e6409 diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c index f04f59d33cc7..aeb34dbe02a4 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c @@ -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;