commit f698ef90706811cbb0d93a26abe85b6af4a2de87
author Elliott Hughes <enh@google.com> Wed Dec 10 00:01:06 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 10 00:01:06 2014 +0000
tree c5370f9becec244e7a7fc226eb50dcdc8c2d5704
parent f575b347d5b03a5b88e0542470bcc9bcecb4ef1c
parent 6183c964468851f49683534af0dc542cb23f89de

Merge "Introduce "adb keygen""

usb_linux.c

diff --git a/usb_linux.c b/usb_linux.c
index f16bdd0..7d13a5d 100644
--- a/usb_linux.c
+++ b/usb_linux.c
@@ -237,8 +237,20 @@
                             // looks like ADB...
                         ep1 = (struct usb_endpoint_descriptor *)bufptr;
                         bufptr += USB_DT_ENDPOINT_SIZE;
+                            // For USB 3.0 SuperSpeed devices, skip potential
+                            // USB 3.0 SuperSpeed Endpoint Companion descriptor
+                        if (bufptr+2 <= devdesc + desclength &&
+                            bufptr[0] == USB_DT_SS_EP_COMP_SIZE &&
+                            bufptr[1] == USB_DT_SS_ENDPOINT_COMP) {
+                            bufptr += USB_DT_SS_EP_COMP_SIZE;
+                        }
                         ep2 = (struct usb_endpoint_descriptor *)bufptr;
                         bufptr += USB_DT_ENDPOINT_SIZE;
+                        if (bufptr+2 <= devdesc + desclength &&
+                            bufptr[0] == USB_DT_SS_EP_COMP_SIZE &&
+                            bufptr[1] == USB_DT_SS_ENDPOINT_COMP) {
+                            bufptr += USB_DT_SS_EP_COMP_SIZE;
+                        }
 
                         if (bufptr > devdesc + desclength ||
                             ep1->bLength != USB_DT_ENDPOINT_SIZE ||