commit 573cea55c785d7388b35cb3ef38cb71b7fd33c4d
author Mike Lockwood <lockwood@android.com> Wed Feb 10 15:26:58 2010 -0500
committer Colin Cross <ccross@android.com> Tue Jun 14 09:08:56 2011 -0700
tree bb84400e8ba7de8ce0e4ebf3f3de4b4e14a40935
parent fe8ae898476eb9c5ed731cce539194e66393cd11

USB: gadget: android: Specify USB_CLASS_COMM in device descriptor if using RNDIS

Signed-off-by: Mike Lockwood <lockwood@android.com>

drivers/usb/gadget/android.c

diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index 72a1aab..73fc4b4 100644
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -100,7 +100,14 @@
 	.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),