| Message ID | 20200520084012.30190-1-dinghao.liu@zju.edu.cn |
|---|---|
| State | Deferred |
| Headers | show |
| Series | PCI: tegra: fix runtime pm imbalance on error | expand |
On Wed, May 20, 2020 at 04:40:12PM +0800, Dinghao Liu wrote: > pm_runtime_get_sync() increments the runtime PM usage counter even > it returns an error code. Thus a pairing decrement is needed on s/even it/even when it/ > the error handling path to keep the counter balanced. > > Also This driver forgets to call pm_runtime_disable() when s/Also This/Also this/ > 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(-) Otherwise looks correct. It's came as somewhat of a surprise to me that pm_runtime_get_sync() increments the usage counter even on failure, but it does indeed. With the above fixes to the commit message: Acked-by: Thierry Reding <treding@nvidia.com>
On Wed, May 20, 2020 at 04:40:12PM +0800, Dinghao Liu wrote: > pm_runtime_get_sync() increments the runtime PM usage counter even > it returns an error code. Thus a pairing decrement is needed on > the error handling path to keep the counter balanced. > > Also This driver forgets to call pm_runtime_disable() when > pm_runtime_get_sync() returns an error code. 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(-) > > 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); > -- > 2.17.1 >
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 it returns an error code. Thus a pairing decrement is needed on the error handling path to keep the counter balanced. Also This driver forgets to 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(-)