commit 95e8007578193422ef7fe2d098b80e8ba99fc48d
author Ethan Yonker <dees_troy@teamw.in> Thu Aug 24 21:45:50 2017 -0500
committer Ethan Yonker <dees_troy@teamw.in> Thu Aug 24 21:45:50 2017 -0500
tree 856f90d15b1f7c74d497503bd6ac6fd12b08b32d
parent c0c5c3a1a49bb41eb1b9d7fc1f7cda0dc1007f3b

DO NOT MERGE Android 8.0 stuff

Change-Id: I8c8a9734adbf36c33463123844fa6e078934ae34

mtp/MtpDataPacket.cpp

diff --git a/mtp/MtpDataPacket.cpp b/mtp/MtpDataPacket.cpp
index 2c51725..845db96 100644
--- a/mtp/MtpDataPacket.cpp
+++ b/mtp/MtpDataPacket.cpp
@@ -427,7 +427,11 @@
 
 // Wait for result of readDataAsync
 int MtpDataPacket::readDataWait(struct usb_device *device) {
+#ifdef HAS_USBHOST_TIMEOUT
+	struct usb_request *req = usb_request_wait(device, 200);
+#else
 	struct usb_request *req = usb_request_wait(device);
+#endif
 	return (req ? req->actual_length : -1);
 }