From f2607442d8e8395da83a8aa8a247c305e61148db Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 2 Jul 2010 21:49:02 -0700 Subject: [PATCH] --- yaml --- r: 200873 b: refs/heads/master c: 0dacca73a3ddefa6cb8a7e0282f938e01faa1a64 h: refs/heads/master i: 200871: 8dd12179bf7e5238d6e5be9970ef6663a18d1530 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/usbnet.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 989ba5cbcfec..84060a87a922 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b00ac51ffcda994ef0839001257be894cc6e5a8 +refs/heads/master: 0dacca73a3ddefa6cb8a7e0282f938e01faa1a64 diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c index a95c73de5824..81c76ada8e56 100644 --- a/trunk/drivers/net/usb/usbnet.c +++ b/trunk/drivers/net/usb/usbnet.c @@ -1293,6 +1293,9 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) goto out; } + /* netdev_printk() needs this so do it as early as possible */ + SET_NETDEV_DEV(net, &udev->dev); + dev = netdev_priv(net); dev->udev = xdev; dev->intf = udev; @@ -1377,8 +1380,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) dev->rx_urb_size = dev->hard_mtu; dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1); - SET_NETDEV_DEV(net, &udev->dev); - if ((dev->driver_info->flags & FLAG_WLAN) != 0) SET_NETDEV_DEVTYPE(net, &wlan_type); if ((dev->driver_info->flags & FLAG_WWAN) != 0)