commit 8bbae239156cb51fd36300368588e9bf8d42613d
author Omari Stephens <xsdg@android.com> Mon May 09 18:45:06 2011 -0700
committer Omari Stephens <xsdg@android.com> Mon May 09 19:14:24 2011 -0700
tree 80d2319823bfcc732d515c5b5a34c6458034e9b6
parent 0ab886bdabd167b32aad90ce5d4e00ce8392858c

Add a 1000msec timeout for adb's USB control packets

Includes a version bump to make it possible to determine if a given
binary has this fix or not.

Bug: 4111855
Change-Id: I86d902a7fa0c4b906264141d2467b7bdddb61801

adb/usb_linux.c

diff --git a/adb/usb_linux.c b/adb/usb_linux.c
index b7ee4ec..4d55b74 100644
--- a/adb/usb_linux.c
+++ b/adb/usb_linux.c
@@ -605,6 +605,7 @@
         ctrl.wIndex = 0;
         ctrl.wLength = sizeof(languages);
         ctrl.data = languages;
+        ctrl.timeout = 1000;
 
         result = ioctl(usb->desc, USBDEVFS_CONTROL, &ctrl);
         if (result > 0)
@@ -620,6 +621,7 @@
             ctrl.wIndex = __le16_to_cpu(languages[i]);
             ctrl.wLength = sizeof(buffer);
             ctrl.data = buffer;
+            ctrl.timeout = 1000;
 
             result = ioctl(usb->desc, USBDEVFS_CONTROL, &ctrl);
             if (result > 0) {