drivers/pci/controller/pci-xgene.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
xgene_pcie_init_port() obtains and enables the controller clock manually.
When xgene_pcie_setup() or pci_host_probe() fails, probe returns without
disabling, unpreparing, or releasing the clock. A failed enable also leaves
the clk_get() reference unreleased.
Use devm_clk_get_enabled() so the clock is unwound automatically on probe
failure and device removal.
Fixes: 5f6b6ccdbe1c ("PCI: xgene: Add APM X-Gene PCIe driver")
Signed-off-by: Yuho Choi <dbgh9129@gmail.com>
---
drivers/pci/controller/pci-xgene.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
index b95afa35201d..4fe3581b9372 100644
--- a/drivers/pci/controller/pci-xgene.c
+++ b/drivers/pci/controller/pci-xgene.c
@@ -321,18 +321,11 @@ static void xgene_pcie_linkup(struct xgene_pcie *port,
static int xgene_pcie_init_port(struct xgene_pcie *port)
{
struct device *dev = port->dev;
- int rc;
- port->clk = clk_get(dev, NULL);
+ port->clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(port->clk)) {
dev_err(dev, "clock not available\n");
- return -ENODEV;
- }
-
- rc = clk_prepare_enable(port->clk);
- if (rc) {
- dev_err(dev, "clock enable failed\n");
- return rc;
+ return PTR_ERR(port->clk);
}
return 0;
--
2.43.0
On Sun, 02 Aug 2026 18:11:46 -0400, Yuho Choi wrote:
> xgene_pcie_init_port() obtains and enables the controller clock manually.
> When xgene_pcie_setup() or pci_host_probe() fails, probe returns without
> disabling, unpreparing, or releasing the clock. A failed enable also leaves
> the clk_get() reference unreleased.
>
> Use devm_clk_get_enabled() so the clock is unwound automatically on probe
> failure and device removal.
>
> [...]
Applied, thanks!
[1/1] PCI: xgene: Use managed clock for PCIe controller
commit: b9022584ebbae81f7bbe4a61bd1df0d0a95e1a99
Best regards,
--
மணிவண்ணன் சதாசிவம்
© 2016 - 2026 Red Hat, Inc.