提交 e3ad412a 编写于 作者: H hayeswang 提交者: David S. Miller

r8152: move the actions of saving the information of the device

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: NHayes Wang <hayeswang@realtek.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 45f4a19f
...@@ -2759,6 +2759,10 @@ static int rtl8152_probe(struct usb_interface *intf, ...@@ -2759,6 +2759,10 @@ static int rtl8152_probe(struct usb_interface *intf,
tp = netdev_priv(netdev); tp = netdev_priv(netdev);
tp->msg_enable = 0x7FFF; tp->msg_enable = 0x7FFF;
tp->udev = udev;
tp->netdev = netdev;
tp->intf = intf;
if (!rtl_ops_init(tp, id)) { if (!rtl_ops_init(tp, id)) {
netif_err(tp, probe, netdev, "Unknown Device"); netif_err(tp, probe, netdev, "Unknown Device");
return -ENODEV; return -ENODEV;
...@@ -2767,9 +2771,6 @@ static int rtl8152_probe(struct usb_interface *intf, ...@@ -2767,9 +2771,6 @@ static int rtl8152_probe(struct usb_interface *intf,
tasklet_init(&tp->tl, bottom_half, (unsigned long)tp); tasklet_init(&tp->tl, bottom_half, (unsigned long)tp);
INIT_DELAYED_WORK(&tp->schedule, rtl_work_func_t); 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->netdev_ops = &rtl8152_netdev_ops;
netdev->watchdog_timeo = RTL8152_TX_TIMEOUT; netdev->watchdog_timeo = RTL8152_TX_TIMEOUT;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册