PCI: dra7xx: Disable pm_runtime on get_sync failure
authorKishon Vijay Abraham I <kishon@ti.com>
Fri, 31 Jul 2015 12:25:10 +0000 (17:55 +0530)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 11 Aug 2015 20:42:47 +0000 (15:42 -0500)
Fix the error handling when pm_runtime_get_sync() fails.

If pm_runtime_get_sync() fails, call pm_runtime_disable() so there are no
unbalanced pm_runtime_enable() calls.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Jingoo Han <jingoohan1@gmail.com>
drivers/pci/host/pci-dra7xx.c

index 80db09e47800dffb017d64177fe00775539d27b0..d8b6d66b95b75013c803c1f2e1f38b9a46466a43 100644 (file)
@@ -384,7 +384,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
        ret = pm_runtime_get_sync(dev);
        if (IS_ERR_VALUE(ret)) {
                dev_err(dev, "pm_runtime_get_sync failed\n");
-               goto err_phy;
+               goto err_get_sync;
        }
 
        reg = dra7xx_pcie_readl(dra7xx, PCIECTRL_DRA7XX_CONF_DEVICE_CMD);
@@ -401,6 +401,8 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
 
 err_add_port:
        pm_runtime_put(dev);
+
+err_get_sync:
        pm_runtime_disable(dev);
 
 err_phy: