diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-10-22 14:36:46 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-29 16:01:20 +0800 |
| commit | e463fbe419b70744c7126ec198c6d6e2cffa5c87 (patch) | |
| tree | 26ee3eff778d3b82b10398dca5e3b637c9717081 /drivers/staging/comedi/drivers/usbduxsigma.c | |
| parent | staging: comedi: usbdux: use comedi_buf_read_samples() (diff) | |
| download | linux-dev-e463fbe419b70744c7126ec198c6d6e2cffa5c87.tar.xz linux-dev-e463fbe419b70744c7126ec198c6d6e2cffa5c87.zip | |
staging: comedi: usbduxsigma: use comedi_buf_read_samples()
Use comedi_buf_read_samples() to read the analog output samples from
the async buffer. That function will set the COMEDI_CB_BLOCK event
when samples are read from the async buffer.
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/usbduxsigma.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/usbduxsigma.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c index 1d12cc6c1ade..de3fb41b1886 100644 --- a/drivers/staging/comedi/drivers/usbduxsigma.c +++ b/drivers/staging/comedi/drivers/usbduxsigma.c @@ -374,7 +374,7 @@ static void usbduxsigma_ao_handle_urb(struct comedi_device *dev, unsigned int chan = CR_CHAN(cmd->chanlist[i]); unsigned short val; - if (!comedi_buf_get(s, &val)) { + if (!comedi_buf_read_samples(s, &val, 1)) { dev_err(dev->class_dev, "buffer underflow\n"); async->events |= COMEDI_CB_OVERFLOW; return; @@ -384,7 +384,6 @@ static void usbduxsigma_ao_handle_urb(struct comedi_device *dev, *datap++ = chan; s->readback[chan] = val; } - async->events |= COMEDI_CB_BLOCK; } /* if command is still running, resubmit urb */ |