Skip to contentSkip to conversation

FAILED: patch "[PATCH] PCI: qcom: Fix unbalanced PHY init on probe errors" failed to apply to 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jun 6, 2022

Subsystems (5)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 83013631f0f9961416abd812e228c8efbc2f6069 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Fri, 1 Apr 2022 15:38:54 +0200
Subject: [PATCH] PCI: qcom: Fix unbalanced PHY init on probe errors

Undo the PHY initialisation (e.g. balance runtime PM) if host initialisation fails during probe.

drivers/pci/controller/dwc/pcie-qcom.c +3 -1
index 9191be96d627..2e5464edc36e 100644
@@ -1631,11 +1631,13 @@ static int qcom_pcie_probe(struct platform_device *pdev)
 	ret = dw_pcie_host_init(pp);
 	if (ret) {
 		dev_err(dev, "cannot initialize host\n");
-		goto err_pm_runtime_put;
+		goto err_phy_exit;
 	}
 
 	return 0;
 
+err_phy_exit:
+	phy_exit(pcie->phy);
 err_pm_runtime_put:
 	pm_runtime_put(dev);
 	pm_runtime_disable(dev);