From 343cb9ef6571942e18d05bb810117031b1b5e4b4 Mon Sep 17 00:00:00 2001 From: Bjorge Dijkstra Date: Sat, 26 Jan 2008 00:50:44 +0200 Subject: [PATCH] --- yaml --- r: 81835 b: refs/heads/master c: 786e3dfbae8e2da422affcc1736ca1888f200a27 h: refs/heads/master i: 81833: 77085a1eb4c747fcdeb9ae661b9e2a2b1506d186 81831: dfe8fbde6beb126649bd3f0a54ffd59ee8b21f65 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/cdc_ether.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ba0c28f64622..b149669b5e48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bfa2e1fecac3d8f8a7786a8171b7c75a48fc6d1 +refs/heads/master: 786e3dfbae8e2da422affcc1736ca1888f200a27 diff --git a/trunk/drivers/net/usb/cdc_ether.c b/trunk/drivers/net/usb/cdc_ether.c index a42acc3cc609..97c17bb560ac 100644 --- a/trunk/drivers/net/usb/cdc_ether.c +++ b/trunk/drivers/net/usb/cdc_ether.c @@ -228,15 +228,16 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf) 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