Commit 6c8f85ca authored Jul 10, 2020 by Nicolas Ferre Committed by David S. Miller Jul 10, 2020

net: macb: fix call to pm_runtime in the suspend/resume functions

The calls to pm_runtime_force_suspend/resume() functions are only
relevant if the device is not configured to act as a WoL wakeup source.
Add the device_may_wakeup() test before calling them.

Fixes: 3e2a5e15 ("net: macb: add wake-on-lan support via magic packet")
Cc: Claudiu Beznea <claudiu.beznea@microchip.com>
Cc: Harini Katakam <harini.katakam@xilinx.com>
Cc: Sergio Prado <sergio.prado@e-labworks.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 64febc5e

drivers/net/ethernet/cadence/macb_main.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -4606,6 +4606,7 @@ static int __maybe_unused macb_suspend(struct device *dev)

		if (bp->ptp_info)
		bp->ptp_info->ptp_remove(netdev);
		if (!device_may_wakeup(dev))
		pm_runtime_force_suspend(dev);

		return 0;
		@@ -4621,6 +4622,7 @@ static int __maybe_unused macb_resume(struct device *dev)
		if (!netif_running(netdev))
		return 0;

		if (!device_may_wakeup(dev))
		pm_runtime_force_resume(dev);

		if (bp->wol & MACB_WOL_ENABLED) {

Admin message