diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:13:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:13:26 -0400 |
| commit | d3b8a1a8496c83bc4a3cc76505c29255af15572c (patch) | |
| tree | b56eb3ef27117bad5c516d6b647bdcd465d7659a /drivers/usb/net/usbnet.c | |
| parent | 60564a313a5738960064d6c555ec066d9332f278 (diff) | |
| parent | 0ed0c0c48c508578c30aa58f755ca0d692636906 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/net/usbnet.c')
| -rw-r--r-- | drivers/usb/net/usbnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c index 4cbb408af727..8a945f4f3693 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/usb/net/usbnet.c | |||
| @@ -1429,7 +1429,7 @@ static int generic_cdc_bind (struct usbnet *dev, struct usb_interface *intf) | |||
| 1429 | info->ether = (void *) buf; | 1429 | info->ether = (void *) buf; |
| 1430 | if (info->ether->bLength != sizeof *info->ether) { | 1430 | if (info->ether->bLength != sizeof *info->ether) { |
| 1431 | dev_dbg (&intf->dev, "CDC ether len %u\n", | 1431 | dev_dbg (&intf->dev, "CDC ether len %u\n", |
| 1432 | info->u->bLength); | 1432 | info->ether->bLength); |
| 1433 | goto bad_desc; | 1433 | goto bad_desc; |
| 1434 | } | 1434 | } |
| 1435 | dev->net->mtu = le16_to_cpup ( | 1435 | dev->net->mtu = le16_to_cpup ( |