diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-25 17:36:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-25 17:36:41 +0100 |
| commit | 7a9ad990a091b525e93a41b142cd3a06129a032d (patch) | |
| tree | 7fb58a8fe566ddf75ffe68bec408219958031cd0 /drivers/net/usb/asix_devices.c | |
| parent | 8371e272b158ce56b201bc530841a27320f94e7c (diff) | |
| parent | 8c9257333713c1f185693fe0df2df79dfc1fa1c8 (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlsk-v4.9-18.07-rt
Diffstat (limited to 'drivers/net/usb/asix_devices.c')
| -rw-r--r-- | drivers/net/usb/asix_devices.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c index 32e9ec8f1521..5be6b67492d5 100644 --- a/drivers/net/usb/asix_devices.c +++ b/drivers/net/usb/asix_devices.c @@ -640,10 +640,12 @@ static void ax88772_restore_phy(struct usbnet *dev) priv->presvd_phy_advertise); /* Restore BMCR */ + if (priv->presvd_phy_bmcr & BMCR_ANENABLE) + priv->presvd_phy_bmcr |= BMCR_ANRESTART; + asix_mdio_write_nopm(dev->net, dev->mii.phy_id, MII_BMCR, priv->presvd_phy_bmcr); - mii_nway_restart(&dev->mii); priv->presvd_phy_advertise = 0; priv->presvd_phy_bmcr = 0; } |