From dfa10e9aff5678acb04c4ca62f4350b5a6f586da Mon Sep 17 00:00:00 2001 From: David Brownell Date: Sun, 1 Jul 2007 11:47:59 -0700 Subject: [PATCH] --- yaml --- r: 58153 b: refs/heads/master c: afaee82c0aef7c2b30acff129c723031343e10c2 h: refs/heads/master i: 58151: fc8be2d85d1fa98350538634815d9d0dce740de9 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/cdc_ether.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d1123495a1d0..bd680c669062 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d1a3bbdf21d05e16703c8d608628ae4676eb3ac +refs/heads/master: afaee82c0aef7c2b30acff129c723031343e10c2 diff --git a/trunk/drivers/net/usb/cdc_ether.c b/trunk/drivers/net/usb/cdc_ether.c index 675ac99a79c6..a42acc3cc609 100644 --- a/trunk/drivers/net/usb/cdc_ether.c +++ b/trunk/drivers/net/usb/cdc_ether.c @@ -144,14 +144,14 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf) * modem interface from an RNDIS non-modem. */ if (rndis) { - struct usb_cdc_acm_descriptor *d; + struct usb_cdc_acm_descriptor *acm; - d = (void *) buf; - if (d->bmCapabilities) { + acm = (void *) buf; + if (acm->bmCapabilities) { dev_dbg(&intf->dev, "ACM capabilities %02x, " "not really RNDIS?\n", - d->bmCapabilities); + acm->bmCapabilities); goto bad_desc; } }