From 09c8f1ae12642a0715cd046eb84775a17bc25f2e Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Sat, 30 Jul 2011 22:26:49 +0800 Subject: [PATCH] Revert "USB: gadget: android: Fix special case for RNDIS ethernet function" This reverts commit 316525238a92d521456f389969b24adafc44c2e2. --- drivers/usb/gadget/android.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 77ff19eebbfa..73fc4b465ef5 100755 --- 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), @@ -330,18 +337,6 @@ void android_enable_function(struct usb_function *f, int enable) if (dev->cdev) dev->cdev->desc.idProduct = device_desc.idProduct; -#ifdef CONFIG_USB_ANDROID_RNDIS - /* We need to specify the COMM class in the device descriptor - * if we are using RNDIS. - */ - if (!strcmp(f->name, "rndis")) { - if (enable) - dev->cdev->desc.bDeviceClass = USB_CLASS_COMM; - else - dev->cdev->desc.bDeviceClass = USB_CLASS_PER_INTERFACE; - } -#endif - /* force reenumeration */ if (dev->cdev && dev->cdev->gadget && dev->cdev->gadget->speed != USB_SPEED_UNKNOWN) { -- 2.34.1