* [PATCH next] PCI: rockchip: Clean up on error in rockchip_pcie_init_port()
@ 2025-01-15 6:53 Dan Carpenter
2025-01-15 7:51 ` Krzysztof Wilczyński
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2025-01-15 6:53 UTC (permalink / raw)
To: Anand Moon
Cc: Shawn Lin, Lorenzo Pieralisi, Krzysztof Wilczyński,
Manivannan Sadhasivam, Rob Herring, Bjorn Helgaas, Heiko Stuebner,
linux-pci, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel-janitors
Call phy_exit() before returning on this error path.
Fixes: 853c711e2caf ("PCI: rockchip: Simplify reset control handling by using reset_control_bulk*() function")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/pci/controller/pcie-rockchip.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c
index fea867c24f75..35bfdf3e17a3 100644
--- a/drivers/pci/controller/pcie-rockchip.c
+++ b/drivers/pci/controller/pcie-rockchip.c
@@ -132,8 +132,10 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip)
err = reset_control_bulk_assert(ROCKCHIP_NUM_CORE_RSTS,
rockchip->core_rsts);
- if (err)
- return dev_err_probe(dev, err, "Couldn't assert Core resets\n");
+ if (err) {
+ dev_err_probe(dev, err, "Couldn't assert Core resets\n");
+ goto err_exit_phy;
+ }
udelay(10);
--
2.45.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH next] PCI: rockchip: Clean up on error in rockchip_pcie_init_port()
2025-01-15 6:53 [PATCH next] PCI: rockchip: Clean up on error in rockchip_pcie_init_port() Dan Carpenter
@ 2025-01-15 7:51 ` Krzysztof Wilczyński
0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Wilczyński @ 2025-01-15 7:51 UTC (permalink / raw)
To: Dan Carpenter
Cc: Anand Moon, Shawn Lin, Lorenzo Pieralisi, Manivannan Sadhasivam,
Rob Herring, Bjorn Helgaas, Heiko Stuebner, linux-pci,
linux-rockchip, linux-arm-kernel, linux-kernel, kernel-janitors
Hello,
> Call phy_exit() before returning on this error path.
>
> Fixes: 853c711e2caf ("PCI: rockchip: Simplify reset control handling by using reset_control_bulk*() function")
I squashed this together with the code this fixes. Thank you a bunch!
Krzysztof
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-01-15 9:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-15 6:53 [PATCH next] PCI: rockchip: Clean up on error in rockchip_pcie_init_port() Dan Carpenter
2025-01-15 7:51 ` Krzysztof Wilczyński
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox