From: Salah Triki <salah.triki@gmail.com>
Date: Sat, 19 Jul 2025 04:34:40 +0000 (+0100)
Subject: PCI: mvebu: Use devm_add_action_or_reset() instead of devm_add_action()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c79a7ca8fb72a17db03e916438c44d9afc98998f;p=thirdparty%2Fkernel%2Flinux.git

PCI: mvebu: Use devm_add_action_or_reset() instead of devm_add_action()

Replace devm_add_action() with devm_add_action_or_reset() to avoid
explicitly dropping the 'port->clk' reference in error path.

Signed-off-by: Salah Triki <salah.triki@gmail.com>
[mani: reworded commit subject and description]
Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
Link: https://patch.msgid.link/aHsgYALHfQbrgq0t@pc
---

diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
index a4a2bac4f4b27..755651f33811d 100644
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
@@ -1353,11 +1353,9 @@ static int mvebu_pcie_parse_port(struct mvebu_pcie *pcie,
 		goto skip;
 	}
 
-	ret = devm_add_action(dev, mvebu_pcie_port_clk_put, port);
-	if (ret < 0) {
-		clk_put(port->clk);
+	ret = devm_add_action_or_reset(dev, mvebu_pcie_port_clk_put, port);
+	if (ret < 0)
 		goto err;
-	}
 
 	return 1;