diff options
| author |   Grygorii Strashko <grygorii.strashko@ti.com> | 2016-06-24 21:23:42 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-06-28 08:57:18 -0400 |
| commit | 108a653730e4c654bd0815276276e59ea0d64578 (patch) | |
| tree | 08d6b15eea1eb4c84fc9c3a977f747c33a911690 /drivers/net/ethernet/ti | |
| parent | drivers: net: cpsw: fix suspend when all ethX devices are down (diff) | |
| download | linux-dev-108a653730e4c654bd0815276276e59ea0d64578.tar.xz linux-dev-108a653730e4c654bd0815276276e59ea0d64578.zip | |
drivers: net: cpsw: check return code from pm runtime calls
Add missed check of return code from PM runtime get() calls.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 6e0f0c6636db..4e3d51922248 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1252,7 +1252,11 @@ static int cpsw_ndo_open(struct net_device *ndev) int i, ret; u32 reg; - pm_runtime_get_sync(&priv->pdev->dev); + ret = pm_runtime_get_sync(&priv->pdev->dev); + if (ret < 0) { + pm_runtime_put_noidle(&priv->pdev->dev); + return ret; + } if (!cpsw_common_res_usage_state(priv)) cpsw_intr_disable(priv); @@ -2312,7 +2316,11 @@ static int cpsw_probe(struct platform_device *pdev) /* Need to enable clocks with runtime PM api to access module * registers */ - pm_runtime_get_sync(&pdev->dev); + ret = pm_runtime_get_sync(&pdev->dev); + if (ret < 0) { + pm_runtime_put_noidle(&pdev->dev); + goto clean_runtime_disable_ret; + } priv->version = readl(&priv->regs->id_ver); pm_runtime_put_sync(&pdev->dev); |