Commit d5b0b60a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/mvebu' 

- 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()
parents ed1e2002 c79a7ca8

drivers/pci/controller/pci-mvebu.c

+2 −4
Original line number Diff line number Diff line
@@ -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;