]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
PCI: j721e: Fix j721e_pcie_probe() error path
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sun, 27 Jun 2021 11:46:24 +0000 (13:46 +0200)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 4 Jan 2022 08:48:35 +0000 (09:48 +0100)
BugLink: https://bugs.launchpad.net/bugs/1951822
[ Upstream commit 496bb18483cc0474913e81e18a6b313aaea4c120 ]

If an error occurs after a successful cdns_pcie_init_phy() call, it must be
undone by a cdns_pcie_disable_phy() call, as already done above and below.

Update the goto to branch at the correct place of the error handling path.

Link: https://lore.kernel.org/r/db477b0cb444891a17c4bb424467667dc30d0bab.1624794264.git.christophe.jaillet@wanadoo.fr
Fixes: 49e0efdce791 ("PCI: j721e: Add support to provide refclk to PCIe connector")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Krzysztof WilczyƄski <kw@linux.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/pci/controller/cadence/pci-j721e.c

index ffb176d288cd9e6b48bac56cfa26899ee7ef0b62..918e11082e6a747aa75330d6bea4817765c7b030 100644 (file)
@@ -474,7 +474,7 @@ static int j721e_pcie_probe(struct platform_device *pdev)
                ret = clk_prepare_enable(clk);
                if (ret) {
                        dev_err(dev, "failed to enable pcie_refclk\n");
-                       goto err_get_sync;
+                       goto err_pcie_setup;
                }
                pcie->refclk = clk;