commit e497826dd81aa2b5b67d9607268976f688d704ff
author Christopher Ferris <cferris@google.com> Mon Jan 26 22:09:48 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 26 22:09:48 2015 +0000
tree 891385cdf95b761432971b0f3e1417b97c1b7395
parent 32d30e59243eaf96bebdde860b2ddc7b87eeb7f9
parent 2d67a483ede93f1d3906e1d03f46af34887764ac

am 2d67a483: am cdc38d04: Merge "Fix the v2 descriptor handling."

* commit '2d67a483ede93f1d3906e1d03f46af34887764ac':
  Fix the v2 descriptor handling.

minadbd/usb_linux_client.c

diff --git a/minadbd/usb_linux_client.c b/minadbd/usb_linux_client.c
index e7d3c48..b3a38dc 100644
--- a/minadbd/usb_linux_client.c
+++ b/minadbd/usb_linux_client.c
@@ -69,14 +69,10 @@
 } __attribute__((packed));
 
 struct desc_v2 {
-    struct usb_functionfs_descs_head_v2 {
-        __le32 magic;
-        __le32 length;
-        __le32 flags;
-        __le32 fs_count;
-        __le32 hs_count;
-        __le32 ss_count;
-    } __attribute__((packed)) header;
+    struct usb_functionfs_descs_head_v2 header;
+    // The rest of the structure depends on the flags in the header.
+    __le32 fs_count;
+    __le32 hs_count;
     struct func_desc fs_descs, hs_descs;
 } __attribute__((packed));
 
@@ -304,9 +300,8 @@
     v2_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2);
     v2_descriptor.header.length = cpu_to_le32(sizeof(v2_descriptor));
     v2_descriptor.header.flags = FUNCTIONFS_HAS_FS_DESC | FUNCTIONFS_HAS_HS_DESC;
-    v2_descriptor.header.fs_count = 3;
-    v2_descriptor.header.hs_count = 3;
-    v2_descriptor.header.ss_count = 0;
+    v2_descriptor.fs_count = 3;
+    v2_descriptor.hs_count = 3;
     v2_descriptor.fs_descs = fs_descriptors;
     v2_descriptor.hs_descs = hs_descriptors;