diff options
| author | David S. Miller <[email protected]> | 2019-01-24 22:15:15 -0800 | 
|---|---|---|
| committer | David S. Miller <[email protected]> | 2019-01-24 22:15:15 -0800 | 
| commit | 2ab64da68c2b4aaf2996db66f07c8df6d7b97f36 (patch) | |
| tree | e9db332e38b6e90f441d4763b7e33ad83986486f /drivers/net/phy/phy_device.c | |
| parent | 8f4ebaaa8d97dc531a3f947a8d30a5a70fe38743 (diff) | |
| parent | 434a4315b9617bf1742bc64712bf44a208502f7f (diff) | |
Merge branch 'net-phy-improve-starting-PHY'
Heiner Kallweit says:
====================
net: phy: improve starting PHY
This patch series improves few aspects of starting the PHY.
v2:
- improve a warning in patch 4
v3:
- extend commit message for patch 2
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/phy/phy_device.c')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 5 | 
1 files changed, 2 insertions, 3 deletions
| diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 509d9402fa9a..891e0178b97f 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -951,9 +951,8 @@ int phy_connect_direct(struct net_device *dev, struct phy_device *phydev,  		return rc;  	phy_prepare_link(phydev, handler); -	phy_start_machine(phydev); -	if (phydev->irq > 0) -		phy_start_interrupts(phydev); +	if (phy_interrupt_is_valid(phydev)) +		phy_request_interrupt(phydev);  	return 0;  } |