summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-02-10 15:26:58 -0500
committerColin Cross <ccross@android.com>2011-06-14 09:08:56 -0700
commit573cea55c785d7388b35cb3ef38cb71b7fd33c4d (patch)
treebb84400e8ba7de8ce0e4ebf3f3de4b4e14a40935 /drivers
parentfe8ae898476eb9c5ed731cce539194e66393cd11 (diff)
USB: gadget: android: Specify USB_CLASS_COMM in device descriptor if using RNDIS
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/android.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index 72a1aab6621..73fc4b465ef 100644
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -100,7 +100,14 @@ static struct usb_device_descriptor device_desc = {
.bLength = sizeof(device_desc),
.bDescriptorType = USB_DT_DEVICE,
.bcdUSB = __constant_cpu_to_le16(0x0200),
+#ifdef CONFIG_USB_ANDROID_RNDIS
+ /* we need to specify the class in the device descriptor
+ * if we are using RNDIS.
+ */
+ .bDeviceClass = USB_CLASS_COMM,
+#else
.bDeviceClass = USB_CLASS_PER_INTERFACE,
+#endif
.idVendor = __constant_cpu_to_le16(VENDOR_ID),
.idProduct = __constant_cpu_to_le16(PRODUCT_ID),
.bcdDevice = __constant_cpu_to_le16(0xffff),