]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drivers: net: cpsw: check return code from pm runtime calls
authorGrygorii Strashko <grygorii.strashko@ti.com>
Fri, 24 Jun 2016 18:23:42 +0000 (21:23 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 28 Jun 2016 12:57:18 +0000 (08:57 -0400)
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>
drivers/net/ethernet/ti/cpsw.c

index 6e0f0c6636dbde164aa87b7010cf1dee1afb5731..4e3d51922248e41875d37ba2298803cbd52c119d 100644 (file)
@@ -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);