Commit 9d17becd authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/apple' 

- Switch from gpiod_get_from_of_node() to generic devm GPIO API (Dmitry
  Torokhov)

* remotes/lorenzo/pci/apple:
  PCI: apple: Do not leak reset GPIO on unbind/unload/error
parents ec6daf25 a6b9ede1

drivers/pci/controller/pcie-apple.c

+2 −2
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static int apple_pcie_setup_port(struct apple_pcie *pcie, 
	u32 stat, idx;

	int ret, i;



	reset = gpiod_get_from_of_node(np, "reset-gpios", 0,

	reset = devm_fwnode_gpiod_get(pcie->dev, of_fwnode_handle(np), "reset",

				      GPIOD_OUT_LOW, "PERST#");

	if (IS_ERR(reset))

		return PTR_ERR(reset);