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

This reverts commit 60701f4d86d51c040ce4c38f44e2e1535c164a9f.

diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index 73fc4b465ef5ddf604db3fd5a5ed5c82ac052482..72a1aab66214a1a502ffe9ec9ed2e4b3529b2c4f 100755 (executable)
--- 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),