2021-06-27 11:47:55

by Christophe JAILLET

Subject: [PATCH] PCI: j721e: Fix an error handling path in 'j721e_pcie_probe()'

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.

Fixes: 49e0efdce791 ("PCI: j721e: Add support to provide refclk to PCIe connector")
Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/pci/controller/cadence/pci-j721e.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/controller/cadence/pci-j721e.c b/drivers/pci/controller/cadence/pci-j721e.c
index 35e61048e133..8933db6ab1af 100644
--- a/drivers/pci/controller/cadence/pci-j721e.c
+++ b/drivers/pci/controller/cadence/pci-j721e.c
@@ -424,7 +424,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;

--
2.30.2

2021-09-28 00:56:34

by Krzysztof Wilczyński

Subject: Re: [PATCH] PCI: j721e: Fix an error handling path in 'j721e_pcie_probe()'

Hi Christophe,

Thank you for sending the patch over!

Just a tiny nit-pick: there is no need to surround function names in single
quotes in the subject and in the commit message.

> 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.

Here, in the above sentence, you could simply mention that this is needed
for the device to be correctly powered down should there be an error, and
reference to the "above" and "below" code.

> Update the 'goto' to branch at the correct place of the error handling
> path.
>
> Fixes: 49e0efdce791 ("PCI: j721e: Add support to provide refclk to PCIe connector")
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/pci/controller/cadence/pci-j721e.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/controller/cadence/pci-j721e.c b/drivers/pci/controller/cadence/pci-j721e.c
> index 35e61048e133..8933db6ab1af 100644
> --- a/drivers/pci/controller/cadence/pci-j721e.c
> +++ b/drivers/pci/controller/cadence/pci-j721e.c
> @@ -424,7 +424,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;

Thank you!

Reviewed-by: Krzysztof Wilczyński <[email protected]>

Krzysztof

2021-10-22 09:37:42

by Lorenzo Pieralisi

Subject: Re: [PATCH] PCI: j721e: Fix an error handling path in 'j721e_pcie_probe()'

On Sun, 27 Jun 2021 13:46:24 +0200, Christophe JAILLET wrote:
> 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.
>
> [...]

Applied to pci/cadence, thanks!

[1/1] PCI: j721e: Fix an error handling path in 'j721e_pcie_probe()'
https://git.kernel.org/lpieralisi/pci/c/1faff614aa

Thanks,
Lorenzo