dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pci/controller/mvebu'

Browse Source 
- Use devm_add_action_or_reset() when adding port->clk devm cleanup action
  so we don't have to explicitly call clk_put() (Salah Triki)

* pci/controller/mvebu:
  PCI: mvebu: Use devm_add_action_or_reset() instead of devm_add_action()
This commit is contained in:
Bjorn Helgaas
2025-07-31 16:12:15 -05:00
parent ed1e2002b7 c79a7ca8fb
commit d5b0b60ab0
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/pci/controller/pci-mvebu.c
+2 -4
View File
@@ -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;