commit e49946e1c13309d8ab46269a193c627ce883a73b
author Jerry Zhang <zhangjerry@google.com> Tue Feb 21 22:59:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 21 22:59:04 2017 +0000
tree 1883cbe25281341deef2b6281c2fbbc1515853f7
parent a6804a6deeb7a7f4b74656cfb5f4cc58bd252bbf
parent 1a8bd5f5807a01739be3ef45cecf7819375c398f

Merge "adb: set max_rw to USB_FFS_BULK_SIZE explicitly" am: b63d47356a
am: d59b93a5f5

Change-Id: I7c515a34977c172babb80929a0f41bc4cb0e4148

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index ac05d4c..c08b922 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -319,7 +319,7 @@
     D("[ adb: cannot call endpoint alloc: errno=%d ]", errno);
     // Kernel pre-allocation could have failed for recoverable reasons.
     // Continue running with a safe max rw size.
-    h->max_rw *= 2;
+    h->max_rw = USB_FFS_BULK_SIZE;
     return true;
 
 err: