From: Bernd Porr <Bernd.Porr@f2s.com>
Date: Sat, 28 May 2005 23:27:16 +0000 (+0000)
Subject: urb_kill is available from 2.6.8 and not from 2.6.10. This affects
X-Git-Tag: branch-0_7-end~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9cd30c2f54d22a2dc8179feebd35507805df8034;p=comedi.git

urb_kill is available from 2.6.8 and not from 2.6.10. This affects
especially sarge which works with 2.6.8. The urb_kill command
is much safer than urb_unlink.
---

diff --git a/comedi/drivers/usbduxfast.c b/comedi/drivers/usbduxfast.c
index c2b83058..3270233c 100644
--- a/comedi/drivers/usbduxfast.c
+++ b/comedi/drivers/usbduxfast.c
@@ -234,7 +234,7 @@ 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)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8)
 		j=usb_unlink_urb(usbduxfastsub_tmp->urbIn);
 		if (j<0) {
 			err=j;
@@ -1448,7 +1448,7 @@ static void tidy_up(usbduxfastsub_t* usbduxfastsub_tmp) {
 	usbduxfastsub_tmp->probed=0;
 
 	if (usbduxfastsub_tmp->urbIn) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,8)
 		// waits until a running transfer is over
 		// thus, under 2.4 hotplugging while a command
 		// is running is not safe