From: Bernd Porr <Bernd.Porr@f2s.com>
Date: Tue, 4 Jan 2005 17:10:26 +0000 (+0000)
Subject: Tested with 2.6.10. Introduced min sampling rate which is 60kHz.
X-Git-Tag: r0_7_70~68
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c8a1c9198c3ea8360bd35a527a22046bbd793b5;p=comedi.git

Tested with 2.6.10. Introduced min sampling rate which is 60kHz.
---

diff --git a/comedi/drivers/usbduxfast.c b/comedi/drivers/usbduxfast.c
index 1fdfad09..683df5a5 100644
--- a/comedi/drivers/usbduxfast.c
+++ b/comedi/drivers/usbduxfast.c
@@ -25,7 +25,7 @@ Driver: usbduxfast.c
 Description: ITL USB-DUXfast
 Devices: [ITL] USB-DUX (usbduxfast.o)
 Author: Bernd Porr <BerndPorr@f2s.com>
-Updated: 02 Jan 2005
+Updated: 03 Jan 2005
 Status: testing
 */
 
@@ -232,10 +232,15 @@ static int usbduxfastsub_unlink_InURBs(usbduxfastsub_t* usbduxfastsub_tmp) {
 
 	if (usbduxfastsub_tmp && usbduxfastsub_tmp->urbIn) {
 		usbduxfastsub_tmp->ai_cmd_running=0;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
 		j=usb_unlink_urb(usbduxfastsub_tmp->urbIn);
 		if (j<0) {
 			err=j;
 		}
+#else
+		// waits until a running transfer is over
+		usb_kill_urb(usbduxfastsub_tmp->urbIn);
+#endif
 	}
 #ifdef CONFIG_COMEDI_DEBUG
 	printk("comedi: usbduxfast: unlinked InURB: res=%d\n",