|
@@ -2577,6 +2577,13 @@ static int cpsw_remove(struct platform_device *pdev)
|
|
|
{
|
|
|
struct net_device *ndev = platform_get_drvdata(pdev);
|
|
|
struct cpsw_priv *priv = netdev_priv(ndev);
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ ret = pm_runtime_get_sync(&pdev->dev);
|
|
|
+ if (ret < 0) {
|
|
|
+ pm_runtime_put_noidle(&pdev->dev);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
|
|
|
if (priv->data.dual_emac)
|
|
|
unregister_netdev(cpsw_get_slave_ndev(priv, 1));
|
|
@@ -2584,8 +2591,9 @@ static int cpsw_remove(struct platform_device *pdev)
|
|
|
|
|
|
cpsw_ale_destroy(priv->ale);
|
|
|
cpdma_ctlr_destroy(priv->dma);
|
|
|
- pm_runtime_disable(&pdev->dev);
|
|
|
device_for_each_child(&pdev->dev, NULL, cpsw_remove_child_device);
|
|
|
+ pm_runtime_put_sync(&pdev->dev);
|
|
|
+ pm_runtime_disable(&pdev->dev);
|
|
|
if (priv->data.dual_emac)
|
|
|
free_netdev(cpsw_get_slave_ndev(priv, 1));
|
|
|
free_netdev(ndev);
|