| commit | cc4d11c245d5b514ba758cc095a59cd481c92cae | [log] [tgz] |
|---|---|---|
| author | Andy McFadden <fadden@android.com> | Thu Jul 01 07:30:51 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 01 07:30:51 2010 -0700 |
| tree | 2734383805f0640553aafe9a9e5dd5f8d19afb19 | |
| parent | 931bdcc09a3d805cf25033951adb95c8e5159e46 [diff] | |
| parent | 9f6d28dc454e053ddcfe21879e4575ac86654050 [diff] |
Merge "Fix sim-eng build." into gingerbread
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) {