commit 33533c77058a8dc5fd3b671f146e8fd4be470266
author Jerry Zhang <zhangjerry@google.com> Tue Feb 21 23:01:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 21 23:01:05 2017 +0000
tree 6086ec637479e5547807101e7f1718c39836dcf8
parent 9afb94dcc9ddf528534d51b5fb0e465683a9278d
parent e49946e1c13309d8ab46269a193c627ce883a73b

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

Change-Id: I35d01f0a0059c8d02af5faf574bacafac3b903e2

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: