Commit 515a10a7 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by David S. Miller
Browse files

net: macb: fix wakeup test in runtime suspend/resume routines 



Use the proper struct device pointer to check if the wakeup flag
and wakeup source are positioned.
Use the one passed by function call which is equivalent to
&bp->dev->dev.parent.

It's preventing the trigger of a spurious interrupt in case the
Wake-on-Lan feature is used.

Fixes: d54f89af ("net: macb: Add pm runtime support")
Cc: Claudiu Beznea <claudiu.beznea@microchip.com>
Cc: Harini Katakam <harini.katakam@xilinx.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c8b1d743

drivers/net/ethernet/cadence/macb_main.c

+2 −2
Original line number Diff line number Diff line
@@ -4654,7 +4654,7 @@ static int __maybe_unused macb_runtime_suspend(struct device *dev) 
	struct net_device *netdev = dev_get_drvdata(dev);

	struct macb *bp = netdev_priv(netdev);



	if (!(device_may_wakeup(&bp->dev->dev))) {

	if (!(device_may_wakeup(dev))) {

		clk_disable_unprepare(bp->tx_clk);

		clk_disable_unprepare(bp->hclk);

		clk_disable_unprepare(bp->pclk);
@@ -4670,7 +4670,7 @@ static int __maybe_unused macb_runtime_resume(struct device *dev) 
	struct net_device *netdev = dev_get_drvdata(dev);

	struct macb *bp = netdev_priv(netdev);



	if (!(device_may_wakeup(&bp->dev->dev))) {

	if (!(device_may_wakeup(dev))) {

		clk_prepare_enable(bp->pclk);

		clk_prepare_enable(bp->hclk);

		clk_prepare_enable(bp->tx_clk);

CRA Git | Maintained and supported by SUSTech CRA and CCSE