PCI: tegra: Fix runtime PM imbalance on error

pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code. Thus a pairing decrement is needed on
the error handling path to keep the counter balanced.

Also, call pm_runtime_disable() when pm_runtime_get_sync() returns
an error code.

Link: https://lore.kernel.org/r/20200521024709.2368-1-dinghao.liu@zju.edu.cn
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
index e3e9172..235b456 100644 (file)
--- a/drivers/pci/controller/pci-tegra.c
+++ b/drivers/pci/controller/pci-tegra.c
@@ -2712,7 +2712,7 @@ static int tegra_pcie_probe(struct platform_device *pdev)
        err = pm_runtime_get_sync(pcie->dev);
        if (err < 0) {
                dev_err(dev, "fail to enable pcie controller: %d\n", err);
-               goto teardown_msi;
+               goto pm_runtime_put;
        }
 
        host->busnr = bus->start;
@@ -2746,7 +2746,6 @@ static int tegra_pcie_probe(struct platform_device *pdev)
 pm_runtime_put:
        pm_runtime_put_sync(pcie->dev);
        pm_runtime_disable(pcie->dev);
-teardown_msi:
        tegra_pcie_msi_teardown(pcie);
 put_resources:
        tegra_pcie_put_resources(pcie);