1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index a42acc3cc609..97c17bb560ac 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -228,15 +228,16 @@ next_desc:
                 buf += buf [0];
         }
 
-        /* Microsoft ActiveSync based RNDIS devices lack the CDC descriptors,
-         * so we'll hard-wire the interfaces and not check for descriptors.
+        /* Microsoft ActiveSync based and some regular RNDIS devices lack the
+         * CDC descriptors, so we'll hard-wire the interfaces and not check
+         * for descriptors.
          */
-        if (is_activesync(&intf->cur_altsetting->desc) && !info->u) {
+        if (rndis && !info->u) {
                 info->control = usb_ifnum_to_if(dev->udev, 0);
                 info->data = usb_ifnum_to_if(dev->udev, 1);
                 if (!info->control || !info->data) {
                         dev_dbg(&intf->dev,
-                                "activesync: master #0/%p slave #1/%p\n",
+                                "rndis: master #0/%p slave #1/%p\n",
                                 info->control,
                                 info->data);
                         goto bad_desc;
@@ -316,7 +317,6 @@ void usbnet_cdc_unbind(struct usbnet *dev, struct usb_interface *intf)
 }
 EXPORT_SYMBOL_GPL(usbnet_cdc_unbind);
 
-
 /*-------------------------------------------------------------------------
  *
  * Communications Device Class, Ethernet Control model