aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/mdio_bus.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/phy/mdio_bus.c')
-rw-r--r--drivers/net/phy/mdio_bus.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 868812ff6de8..8755d8cd4166 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -284,9 +284,12 @@ static int mdio_bus_suspend(struct device * dev, pm_message_t state)
284{ 284{
285 int ret = 0; 285 int ret = 0;
286 struct device_driver *drv = dev->driver; 286 struct device_driver *drv = dev->driver;
287 struct phy_driver *phydrv = to_phy_driver(drv);
288 struct phy_device *phydev = to_phy_device(dev);
287 289
288 if (drv && drv->suspend) 290 if ((!device_may_wakeup(phydev->dev.parent)) &&
289 ret = drv->suspend(dev, state); 291 (phydrv && phydrv->suspend))
292 ret = phydrv->suspend(phydev);
290 293
291 return ret; 294 return ret;
292} 295}
@@ -295,9 +298,12 @@ static int mdio_bus_resume(struct device * dev)
295{ 298{
296 int ret = 0; 299 int ret = 0;
297 struct device_driver *drv = dev->driver; 300 struct device_driver *drv = dev->driver;
301 struct phy_driver *phydrv = to_phy_driver(drv);
302 struct phy_device *phydev = to_phy_device(dev);
298 303
299 if (drv && drv->resume) 304 if ((!device_may_wakeup(phydev->dev.parent)) &&
300 ret = drv->resume(dev); 305 (phydrv && phydrv->resume))
306 ret = phydrv->resume(phydev);
301 307
302 return ret; 308 return ret;
303} 309}