Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef1b5bf5 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by David S. Miller
Browse files

net: phy: Fix not to call phy_resume() if PHY is not attached 



This patch fixes an issue that mdio_bus_phy_resume() doesn't call
phy_resume() if the PHY is not attached.

Fixes: 803dd9c7 ("net: phy: avoid suspending twice a PHY")
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e4b08e5

drivers/net/phy/phy_device.c

+6 −5
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static LIST_HEAD(phy_fixup_list); 
static DEFINE_MUTEX(phy_fixup_lock);



#ifdef CONFIG_PM

static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)

static bool mdio_bus_phy_may_suspend(struct phy_device *phydev, bool suspend)

{

	struct device_driver *drv = phydev->mdio.dev.driver;

	struct phy_driver *phydrv = to_phy_driver(drv);
@@ -232,10 +232,11 @@ static bool mdio_bus_phy_may_suspend(struct phy_device *phydev) 
	/* PHY not attached? May suspend if the PHY has not already been

	 * suspended as part of a prior call to phy_disconnect() ->

	 * phy_detach() -> phy_suspend() because the parent netdev might be the

	 * MDIO bus driver and clock gated at this point.

	 * MDIO bus driver and clock gated at this point. Also may resume if

	 * PHY is not attached.

	 */

	if (!netdev)

		return !phydev->suspended;

		return suspend ? !phydev->suspended : phydev->suspended;



	if (netdev->wol_enabled)

		return false;
@@ -270,7 +271,7 @@ static int mdio_bus_phy_suspend(struct device *dev) 
	if (phydev->attached_dev && phydev->adjust_link)

		phy_stop_machine(phydev);



	if (!mdio_bus_phy_may_suspend(phydev))

	if (!mdio_bus_phy_may_suspend(phydev, true))

		return 0;



	return phy_suspend(phydev);
@@ -281,7 +282,7 @@ static int mdio_bus_phy_resume(struct device *dev) 
	struct phy_device *phydev = to_phy_device(dev);

	int ret;



	if (!mdio_bus_phy_may_suspend(phydev))

	if (!mdio_bus_phy_may_suspend(phydev, false))

		goto no_resume;



	ret = phy_resume(phydev);