diff options
| author | Werner Johansson <werner.johansson@sonyericsson.com> | 2010-06-30 21:52:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-30 21:52:19 -0700 |
| commit | 4272a7ad70721acd68cf9f73c0455bda3102c80f (patch) | |
| tree | 90bd9d75b0239806097e4dab4ecf07bdd0ff61c9 | |
| parent | d0645bf0cc76ef7be11cf77a8e1995233a1972e4 (diff) | |
| parent | a8c7404956b4370162a87ae09b851266a4933b54 (diff) | |
| download | system_core-4272a7ad70721acd68cf9f73c0455bda3102c80f.tar.gz system_core-4272a7ad70721acd68cf9f73c0455bda3102c80f.tar.bz2 system_core-4272a7ad70721acd68cf9f73c0455bda3102c80f.zip | |
am a8c74049: am 931bdcc0: Set explicit timeout on USB control transfer
Merge commit 'a8c7404956b4370162a87ae09b851266a4933b54'
* commit 'a8c7404956b4370162a87ae09b851266a4933b54':
Set explicit timeout on USB control transfer
| -rw-r--r-- | fastboot/usb_linux.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fastboot/usb_linux.c b/fastboot/usb_linux.c index 2ce53eb8..78b7b980 100644 --- a/fastboot/usb_linux.c +++ b/fastboot/usb_linux.c @@ -137,6 +137,7 @@ static int filter_usb_device(int fd, char *ptr, int len, int writable, ctrl.wIndex = 0; ctrl.wLength = sizeof(buffer); ctrl.data = buffer; + ctrl.timeout = 50; result = ioctl(fd, USBDEVFS_CONTROL, &ctrl); if (result > 0) { |