sh_eth: Fix power down vs. is_opened flag ordering
commit5.4-rM2-2.2.x-imx-squashedf6a2e94b3f
upstream. sh_eth_close() does a synchronous power down of the device before marking it closed. Revert the order, to make sure the device is never marked opened while suspended. While at it, use pm_runtime_put() instead of pm_runtime_put_sync(), as there is no reason to do a synchronous power down. Fixes:7fa2955ff7
("sh_eth: Fix sleeping function called from invalid context") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Sergei Shtylyov <sergei.shtylyov@gmail.com> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Link: https://lore.kernel.org/r/20210118150812.796791-1-geert+renesas@glider.be Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
fd2f5130ae
commit
0ff55fc4d6
|
@ -2640,10 +2640,10 @@ static int sh_eth_close(struct net_device *ndev)
|
||||||
/* Free all the skbuffs in the Rx queue and the DMA buffer. */
|
/* Free all the skbuffs in the Rx queue and the DMA buffer. */
|
||||||
sh_eth_ring_free(ndev);
|
sh_eth_ring_free(ndev);
|
||||||
|
|
||||||
pm_runtime_put_sync(&mdp->pdev->dev);
|
|
||||||
|
|
||||||
mdp->is_opened = 0;
|
mdp->is_opened = 0;
|
||||||
|
|
||||||
|
pm_runtime_put(&mdp->pdev->dev);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue