From 82cf94cbcf95356ba9ba8c2533291a7792bbe5e7 Mon Sep 17 00:00:00 2001 From: hayeswang Date: Thu, 6 Nov 2014 12:47:38 +0800 Subject: [PATCH] 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 Signed-off-by: David S. Miller --- drivers/net/usb/r8152.c | 3 +-- 1 file changed, 1 insertion(+), 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, tp->netdev = netdev; tp->intf = intf; + r8152b_get_version(tp); ret = rtl_ops_init(tp, id); if (ret) goto out; @@ -3866,11 +3867,9 @@ static int rtl8152_probe(struct usb_interface *intf, tp->mii.phy_id_mask = 0x3f; tp->mii.reg_num_mask = 0x1f; tp->mii.phy_id = R8152_PHY_ID; - tp->mii.supports_gmii = 0; intf->needs_remote_wakeup = 1; - r8152b_get_version(tp); tp->rtl_ops.init(tp); set_ethernet_addr(tp);