From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 22 Oct 2014 22:37:07 +0000 (-0700)
Subject: staging: comedi: usbdux: use comedi_buf_write_samples()
X-Git-Tag: firefly_0821_release~176^2~2665^2~735
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=290d028e0478c5020d69875d817a8b529439874e;p=firefly-linux-kernel-4.4.55.git

staging: comedi: usbdux: use comedi_buf_write_samples()

Use comedi_buf_write_samples() to add the sample to the async buffer.

The async events COMEDI_CB_BLOCK and COMEDI_CB_EOS will be detected and set
by the core. Remove the unnecessary events 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>
---

diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index 53f1e218d0d9..579e6bce529d 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -282,10 +282,9 @@ static void usbduxsub_ai_handle_urb(struct comedi_device *dev,
 				val ^= ((s->maxdata + 1) >> 1);
 
 			/* transfer data */
-			if (!comedi_buf_put(s, val))
+			if (!comedi_buf_write_samples(s, &val, 1))
 				return;
 		}
-		async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
 	}
 
 	/* if command is still running, resubmit urb */