| Message ID | 20200521024709.2368-1-dinghao.liu@zju.edu.cn (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | fcee90cdf6f3a3a371add04d41528d5ba9c3b411 |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | [v2] PCI: tegra: Fix runtime PM imbalance on error | expand |
On Thu, May 21, 2020 at 10:47:09AM +0800, Dinghao Liu wrote: > 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. > > Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> > --- > drivers/pci/controller/pci-tegra.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Acked-by: Thierry Reding <treding@nvidia.com>
On Fri, May 29, 2020 at 08:05:18PM +0200, Thierry Reding wrote: > On Thu, May 21, 2020 at 10:47:09AM +0800, Dinghao Liu wrote: > > 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. > > > > Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> > > --- > > drivers/pci/controller/pci-tegra.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > Acked-by: Thierry Reding <treding@nvidia.com> Applied to pci/tegra, thanks ! Lorenzo
diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c index 3e64ba6a36a8..00236dd65b5b 100644 --- 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);
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. Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> --- drivers/pci/controller/pci-tegra.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)