aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/r8152.c
diff options
context:
space:
mode:
authorhayeswang <hayeswang@realtek.com>2014-11-05 23:47:38 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-06 15:14:30 -0500
commit82cf94cbcf95356ba9ba8c2533291a7792bbe5e7 (patch)
tree54ae2d254a805232fbb57bd491737fb7d6d68491 /drivers/net/usb/r8152.c
parent926c512685ddd8f26f1c789218391530ccd54a35 (diff)
r8152: move r8152b_get_version
Move r8152b_get_version() to the location before rtl_ops_init(). Then, the rtl_ops_init() could use tp->version. Signed-off-by: Hayes Wang <hayeswang@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/r8152.c')
-rw-r--r--drivers/net/usb/r8152.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index fd41675bc038..4b6db8afea71 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -3833,6 +3833,7 @@ static int rtl8152_probe(struct usb_interface *intf,
3833 tp->netdev = netdev; 3833 tp->netdev = netdev;
3834 tp->intf = intf; 3834 tp->intf = intf;
3835 3835
3836 r8152b_get_version(tp);
3836 ret = rtl_ops_init(tp, id); 3837 ret = rtl_ops_init(tp, id);
3837 if (ret) 3838 if (ret)
3838 goto out; 3839 goto out;
@@ -3866,11 +3867,9 @@ static int rtl8152_probe(struct usb_interface *intf,
3866 tp->mii.phy_id_mask = 0x3f; 3867 tp->mii.phy_id_mask = 0x3f;
3867 tp->mii.reg_num_mask = 0x1f; 3868 tp->mii.reg_num_mask = 0x1f;
3868 tp->mii.phy_id = R8152_PHY_ID; 3869 tp->mii.phy_id = R8152_PHY_ID;
3869 tp->mii.supports_gmii = 0;
3870 3870
3871 intf->needs_remote_wakeup = 1; 3871 intf->needs_remote_wakeup = 1;
3872 3872
3873 r8152b_get_version(tp);
3874 tp->rtl_ops.init(tp); 3873 tp->rtl_ops.init(tp);
3875 set_ethernet_addr(tp); 3874 set_ethernet_addr(tp);
3876 3875