commit 4272a7ad70721acd68cf9f73c0455bda3102c80f
author Werner Johansson <werner.johansson@sonyericsson.com> Wed Jun 30 21:52:19 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 30 21:52:19 2010 -0700
tree 90bd9d75b0239806097e4dab4ecf07bdd0ff61c9
parent d0645bf0cc76ef7be11cf77a8e1995233a1972e4
parent a8c7404956b4370162a87ae09b851266a4933b54

am a8c74049: am 931bdcc0: Set explicit timeout on USB control transfer

Merge commit 'a8c7404956b4370162a87ae09b851266a4933b54'

* commit 'a8c7404956b4370162a87ae09b851266a4933b54':
  Set explicit timeout on USB control transfer

fastboot/usb_linux.c

diff --git a/fastboot/usb_linux.c b/fastboot/usb_linux.c
index 2ce53eb..78b7b98 100644
--- a/fastboot/usb_linux.c
+++ b/fastboot/usb_linux.c
@@ -137,6 +137,7 @@
         ctrl.wIndex = 0;
         ctrl.wLength = sizeof(buffer);
         ctrl.data = buffer;
+	ctrl.timeout = 50;
 
         result = ioctl(fd, USBDEVFS_CONTROL, &ctrl);
         if (result > 0) {