diff mbox

[net-next] r8169:Actually from r810x_pll_power_up

Message ID 1440594505-2908-1-git-send-email-corcodel.marian@gmail.com
State Rejected, archived
Delegated to: David Miller
Headers show

Commit Message

Corcodel Marian Aug. 26, 2015, 1:08 p.m. UTC
Actually from r810x_pll_power_up function i removed function
  r810x_phy_power_up because is two situation.One run from  rtl8169_phy_reset
 wich already power on interface after reset MII_BMCR  and two i placed
 supplementary on __rtl8169_resume.

Signed-off-by: Corcodel Marian <corcodel.marian@gmail.com>

Comments

Francois Romieu Aug. 26, 2015, 9:13 p.m. UTC | #1
Corcodel Marian <corcodel.marian@gmail.com> :
> Actually from r810x_pll_power_up function i removed function
>   r810x_phy_power_up because is two situation.One run from  rtl8169_phy_reset
>  wich already power on interface after reset MII_BMCR  and two i placed
>  supplementary on __rtl8169_resume.

r810x_phy_power_up and r810x_pll_power_up are dedicated to 810x chipsets.

__rtl8169_resume is used by all chipsets.
diff mbox

Patch

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 91cf3a6..2d712a4 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -4699,7 +4699,6 @@  static void r810x_pll_power_up(struct rtl8169_private *tp)
 {
 	void __iomem *ioaddr = tp->mmio_addr;
 
-	r810x_phy_power_up(tp);
 
 	switch (tp->mac_version) {
 	case RTL_GIGA_MAC_VER_07:
@@ -7862,7 +7861,7 @@  static void __rtl8169_resume(struct net_device *dev)
 	struct rtl8169_private *tp = netdev_priv(dev);
 
 	netif_device_attach(dev);
-
+	r810x_phy_power_up(tp);	
 	rtl_pll_power_up(tp);
 
 	rtl_lock_work(tp);