]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
r8152: move the actions of saving the information of the device
authorhayeswang <hayeswang@realtek.com>
Mon, 6 Jan 2014 09:08:42 +0000 (17:08 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 6 Jan 2014 21:24:09 +0000 (16:24 -0500)
Some information of the device may be used in other functions. Move
the relative code to make sure it would be initialzed correctly
before using it.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/r8152.c

index 095f15b56e7cc6ad252a42fb1743b78acd628c83..8615681096b16f9497fc0afaf496b36489b5833f 100644 (file)
@@ -2759,6 +2759,10 @@ static int rtl8152_probe(struct usb_interface *intf,
        tp = netdev_priv(netdev);
        tp->msg_enable = 0x7FFF;
 
+       tp->udev = udev;
+       tp->netdev = netdev;
+       tp->intf = intf;
+
        if (!rtl_ops_init(tp, id)) {
                netif_err(tp, probe, netdev, "Unknown Device");
                return -ENODEV;
@@ -2767,9 +2771,6 @@ static int rtl8152_probe(struct usb_interface *intf,
        tasklet_init(&tp->tl, bottom_half, (unsigned long)tp);
        INIT_DELAYED_WORK(&tp->schedule, rtl_work_func_t);
 
-       tp->udev = udev;
-       tp->netdev = netdev;
-       tp->intf = intf;
        netdev->netdev_ops = &rtl8152_netdev_ops;
        netdev->watchdog_timeo = RTL8152_TX_TIMEOUT;