Commit 23c233c6 authored by Dinghao Liu's avatar Dinghao Liu Committed by Greg Kroah-Hartman

PCI: tegra: Fix runtime PM imbalance on error

[ Upstream commit fcee90cd ]

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.cnSigned-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2138dc84
...@@ -2400,7 +2400,7 @@ static int tegra_pcie_probe(struct platform_device *pdev) ...@@ -2400,7 +2400,7 @@ static int tegra_pcie_probe(struct platform_device *pdev)
err = pm_runtime_get_sync(pcie->dev); err = pm_runtime_get_sync(pcie->dev);
if (err < 0) { if (err < 0) {
dev_err(dev, "fail to enable pcie controller: %d\n", err); dev_err(dev, "fail to enable pcie controller: %d\n", err);
goto teardown_msi; goto pm_runtime_put;
} }
err = tegra_pcie_request_resources(pcie); err = tegra_pcie_request_resources(pcie);
...@@ -2440,7 +2440,6 @@ static int tegra_pcie_probe(struct platform_device *pdev) ...@@ -2440,7 +2440,6 @@ static int tegra_pcie_probe(struct platform_device *pdev)
pm_runtime_put: pm_runtime_put:
pm_runtime_put_sync(pcie->dev); pm_runtime_put_sync(pcie->dev);
pm_runtime_disable(pcie->dev); pm_runtime_disable(pcie->dev);
teardown_msi:
tegra_pcie_msi_teardown(pcie); tegra_pcie_msi_teardown(pcie);
put_resources: put_resources:
tegra_pcie_put_resources(pcie); tegra_pcie_put_resources(pcie);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment