xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Three sets of overlapping changes, two in the packet scheduler
and one in the meson-gxl PHY driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2017-12-16 22:11:55 -05:00
parent 28dc4c8f45 f3b5ad89de
commit c30abd5e40
446 changed files with 2947 additions and 3468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/phy/phy_device.c
View File

@@ -135,7 +135,9 @@ static int mdio_bus_phy_resume(struct device *dev)
if (!mdio_bus_phy_may_suspend(phydev))
goto no_resume;
mutex_lock(&phydev->lock);
ret = phy_resume(phydev);
mutex_unlock(&phydev->lock);
if (ret < 0)
return ret;
@@ -1039,7 +1041,9 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
if (err)
goto error;
mutex_lock(&phydev->lock);
phy_resume(phydev);
mutex_unlock(&phydev->lock);
phy_led_triggers_register(phydev);
return err;
@@ -1173,6 +1177,8 @@ int phy_resume(struct phy_device *phydev)
struct phy_driver *phydrv = to_phy_driver(phydev->mdio.dev.driver);
int ret = 0;
WARN_ON(!mutex_is_locked(&phydev->lock));
if (phydev->drv && phydrv->resume)
ret = phydrv->resume(phydev);
@@ -1679,13 +1685,9 @@ int genphy_resume(struct phy_device *phydev)
{
int value;
mutex_lock(&phydev->lock);
value = phy_read(phydev, MII_BMCR);
phy_write(phydev, MII_BMCR, value & ~BMCR_PDOWN);
mutex_unlock(&phydev->lock);
return 0;
}
EXPORT_SYMBOL(genphy_resume);