From: Thomas Jarosch <opensource@intra2net.com>
Date: Sun, 24 Apr 2005 15:24:44 +0000 (+0000)
Subject: libftdi: (tomj) removed (forbidden) USB reset code for kernel 2.6
X-Git-Tag: v0.6~2
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=b4c2d096a082cc051c59b80703f3c170fa2bff09;p=libftdi

libftdi: (tomj) removed (forbidden) USB reset code for kernel 2.6
---

diff --git a/src/ftdi.c b/src/ftdi.c
index b3a2236..69ad240 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -16,7 +16,6 @@
 
 #include <usb.h>
 #include <string.h>
-#include <sys/utsname.h>
 
 #include "ftdi.h"
 
@@ -199,24 +198,9 @@ int ftdi_usb_open_desc(struct ftdi_context *ftdi, int vendor, int product,
 
 int ftdi_usb_reset(struct ftdi_context *ftdi)
 {
-#if defined(__linux__)
-    struct utsname kernelver;
-    int k_major, k_minor, k_myver;
-#endif
-
     if (usb_control_msg(ftdi->usb_dev, 0x40, 0, 0, ftdi->index, NULL, 0, ftdi->usb_write_timeout) != 0)
         ftdi_error_return(-1,"FTDI reset failed");
 
-#if defined(__linux__)
-    /* Kernel 2.6 (maybe higher versions, too) need an additional usb_reset */
-    if (uname(&kernelver) == 0 && sscanf(kernelver.release, "%d.%d", &k_major, &k_minor) == 2) {
-        k_myver = k_major*10 + k_minor;
-
-        if (k_myver >= 26 && usb_reset(ftdi->usb_dev) != 0)
-            ftdi_error_return(-2, "USB reset failed");
-    }
-#endif
-
     // Invalidate data in the readbuffer
     ftdi->readbuffer_offset = 0;
     ftdi->readbuffer_remaining = 0;