1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index d006dc652e02..bd102f5052ba 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -293,15 +293,16 @@ static int __init eth_bind(struct usb_composite_dev *cdev)
                 /* CDC Subset */
                 eth_config_driver.label = "CDC Subset/SAFE";
 
-                device_desc.idVendor = cpu_to_le16(SIMPLE_VENDOR_NUM),
-                device_desc.idProduct = cpu_to_le16(SIMPLE_PRODUCT_NUM),
-                device_desc.bDeviceClass = USB_CLASS_VENDOR_SPEC;
+                device_desc.idVendor = cpu_to_le16(SIMPLE_VENDOR_NUM);
+                device_desc.idProduct = cpu_to_le16(SIMPLE_PRODUCT_NUM);
+                if (!has_rndis())
+                        device_desc.bDeviceClass = USB_CLASS_VENDOR_SPEC;
         }
 
         if (has_rndis()) {
                 /* RNDIS plus ECM-or-Subset */
-                device_desc.idVendor = cpu_to_le16(RNDIS_VENDOR_NUM),
-                device_desc.idProduct = cpu_to_le16(RNDIS_PRODUCT_NUM),
+                device_desc.idVendor = cpu_to_le16(RNDIS_VENDOR_NUM);
+                device_desc.idProduct = cpu_to_le16(RNDIS_PRODUCT_NUM);
                 device_desc.bNumConfigurations = 2;
         }