Merge USB 4.20-rc8 mergepoint into usb-next

We need the USB changes in here for additional patches to be able to
apply cleanly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 18e92c19c5ab..26c41ede54a4 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -308,11 +308,8 @@ static int mdio_bus_phy_restore(struct device *dev)
         if (ret < 0)
                 return ret;
 
-        /* The PHY needs to renegotiate. */
-        phydev->link = 0;
-        phydev->state = PHY_UP;
-
-        phy_start_machine(phydev);
+        if (phydev->attached_dev && phydev->adjust_link)
+                phy_start_machine(phydev);
 
         return 0;
 }