All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] PCI: tegra: fix runtime pm imbalance on error
@ 2020-05-20  8:40 Dinghao Liu
       [not found] ` <20200520084012.30190-1-dinghao.liu-Y5EWUtBUdg4nDS1+zs4M5A@public.gmane.org>
  0 siblings, 1 reply; 16+ messages in thread
From: Dinghao Liu @ 2020-05-20  8:40 UTC (permalink / raw)
  To: dinghao.liu, kjlu
  Cc: Thierry Reding, Lorenzo Pieralisi, Rob Herring, Bjorn Helgaas,
	Jonathan Hunter, linux-tegra, linux-pci, linux-kernel

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(-)

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

^ permalink raw reply related	[flat|nested] 16+ messages in thread
* [PATCH] PCI: tegra: fix runtime pm imbalance on error
@ 2020-05-20  8:52 ` Dinghao Liu
  0 siblings, 0 replies; 16+ messages in thread
From: Dinghao Liu @ 2020-05-20  8:52 UTC (permalink / raw)
  To: dinghao.liu-Y5EWUtBUdg4nDS1+zs4M5A, kjlu-OJFnDUYgAso
  Cc: Lorenzo Pieralisi, Rob Herring, Bjorn Helgaas, Thierry Reding,
	Jonathan Hunter, Vidya Sagar, Andrew Murray,
	linux-pci-u79uwXL29TY76Z2rM5mHXA,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA

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.

Signed-off-by: Dinghao Liu <dinghao.liu-Y5EWUtBUdg4nDS1+zs4M5A@public.gmane.org>
---
 drivers/pci/controller/dwc/pcie-tegra194.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
index ae30a2fd3716..a69f9e49dcb5 100644
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -1651,8 +1651,8 @@ static int tegra_pcie_config_rp(struct tegra_pcie_dw *pcie)
 fail_host_init:
 	tegra_pcie_deinit_controller(pcie);
 fail_pinctrl:
-	pm_runtime_put_sync(dev);
 fail_pm_get_sync:
+	pm_runtime_put_sync(dev);
 	pm_runtime_disable(dev);
 	return ret;
 }
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2020-05-29 10:58 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-20  8:40 [PATCH] PCI: tegra: fix runtime pm imbalance on error Dinghao Liu
     [not found] ` <20200520084012.30190-1-dinghao.liu-Y5EWUtBUdg4nDS1+zs4M5A@public.gmane.org>
2020-05-20  9:40   ` Thierry Reding
2020-05-20  9:40     ` Thierry Reding
2020-05-20 16:42   ` Bjorn Helgaas
2020-05-20 16:42     ` Bjorn Helgaas
2020-05-20  8:52 Dinghao Liu
2020-05-20  8:52 ` Dinghao Liu
     [not found] ` <20200520085231.32552-1-dinghao.liu-Y5EWUtBUdg4nDS1+zs4M5A@public.gmane.org>
2020-05-20  9:59   ` Thierry Reding
2020-05-20  9:59     ` Thierry Reding
2020-05-20 16:37     ` Bjorn Helgaas
2020-05-20 18:09       ` Vidya Sagar
2020-05-20 18:09         ` Vidya Sagar
     [not found]         ` <e7c967a0-c285-450a-bbad-f6456c661d41-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2020-05-29 10:23           ` Lorenzo Pieralisi
2020-05-29 10:23             ` Lorenzo Pieralisi
2020-05-29 10:58             ` Vidya Sagar
2020-05-29 10:58               ` Vidya Sagar

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.