From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:26:52 +0000 (+0800)
Subject: Revert "USB: gadget: android: Specify USB_CLASS_COMM in device descriptor if using... 
X-Git-Tag: firefly_0821_release~9980
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f34f56069663556d2032994ad593014d82c56ac2;p=firefly-linux-kernel-4.4.55.git

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

This reverts commit 60701f4d86d51c040ce4c38f44e2e1535c164a9f.
---

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