| Message ID | 20220610120411.10619-1-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [stable-4.9] PCI: qcom: Fix unbalanced PHY init on probe errors | expand |
On Fri, Jun 10, 2022 at 02:04:11PM +0200, Johan Hovold wrote: > commit 83013631f0f9961416abd812e228c8efbc2f6069 upstream. > > Undo the PHY initialisation (e.g. balance runtime PM) if host > initialisation fails during probe. > > Link: https://lore.kernel.org/r/20220401133854.10421-3-johan+linaro@kernel.org > Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com> > Cc: stable@vger.kernel.org # 4.5 > [ johan: adjust context to 4.9 ] > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- > drivers/pci/host/pcie-qcom.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) All now queued up, thanks. greg k-h
diff --git a/drivers/pci/host/pcie-qcom.c b/drivers/pci/host/pcie-qcom.c index aeb46f8c7087..4e21ca3c067e 100644 --- a/drivers/pci/host/pcie-qcom.c +++ b/drivers/pci/host/pcie-qcom.c @@ -562,10 +562,15 @@ static int qcom_pcie_probe(struct platform_device *pdev) ret = dw_pcie_host_init(pp); if (ret) { dev_err(dev, "cannot initialize host\n"); - return ret; + goto err_phy_exit; } return 0; + +err_phy_exit: + phy_exit(pcie->phy); + + return ret; } static const struct of_device_id qcom_pcie_match[] = {
commit 83013631f0f9961416abd812e228c8efbc2f6069 upstream. Undo the PHY initialisation (e.g. balance runtime PM) if host initialisation fails during probe. Link: https://lore.kernel.org/r/20220401133854.10421-3-johan+linaro@kernel.org Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com> Cc: stable@vger.kernel.org # 4.5 [ johan: adjust context to 4.9 ] Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/pci/host/pcie-qcom.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)