commit ab0d542506b5fdbcc431ba2606248471d22322ba
author Elliott Hughes <enh@google.com> Mon Dec 08 23:04:58 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 08 23:04:58 2014 +0000
tree 2db74cea2b200ebcd57b43bf28cd61de46138413
parent dbb7c46d686e55aabd52a8e4c5494768c8955a2f
parent 1c02213e89f99c6f532b27048feb8f3170cac296

Merge "fastboot: Support USB 3.x SuperSpeed devices on Linux"

fastboot/usb_linux.c

diff --git a/fastboot/usb_linux.c b/fastboot/usb_linux.c
index fabbd51..022f364 100644
--- a/fastboot/usb_linux.c
+++ b/fastboot/usb_linux.c
@@ -223,6 +223,13 @@
             } else {
                 out = ept->bEndpointAddress;
             }
+
+            // For USB 3.0 devices skip the SS Endpoint Companion descriptor
+            if (check((struct usb_descriptor_hdr *)ptr, len,
+                      USB_DT_SS_ENDPOINT_COMP, USB_DT_SS_EP_COMP_SIZE) == 0) {
+                len -= USB_DT_SS_EP_COMP_SIZE;
+                ptr += USB_DT_SS_EP_COMP_SIZE;
+            }
         }
 
         info.has_bulk_in = (in != -1);