diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-10-22 15:36:58 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-29 16:03:14 +0800 |
| commit | 562de49c526117fac6c78fb1e92dd7f1f1349af6 (patch) | |
| tree | 5dffe5309de17ebe0cd70225052984442b9104e6 | |
| parent | 191db0902606214aed1a90396698c28044d0a753 (diff) | |
| download | op-kernel-dev-562de49c526117fac6c78fb1e92dd7f1f1349af6.zip op-kernel-dev-562de49c526117fac6c78fb1e92dd7f1f1349af6.tar.gz | |
staging: comedi: ni_65xx: use comedi_buf_write_samples()
Use comedi_buf_write_samples() to add the sample to the async buffer.
The async events COMEDI_CB_EOS will automatically be set by the core
with the end-of-scan is detected. Remove the unnecessary event in the
driver.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_65xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c index 973f005..bcb326e 100644 --- a/drivers/staging/comedi/drivers/ni_65xx.c +++ b/drivers/staging/comedi/drivers/ni_65xx.c @@ -508,9 +508,9 @@ static irqreturn_t ni_65xx_interrupt(int irq, void *d) writeb(NI_65XX_CLR_EDGE_INT | NI_65XX_CLR_OVERFLOW_INT, dev->mmio + NI_65XX_CLR_REG); - comedi_buf_put(s, 0); - s->async->events |= COMEDI_CB_EOS; + comedi_buf_write_samples(s, &s->state, 1); comedi_handle_events(dev, s); + return IRQ_HANDLED; } |
