Skip to content

Commit

Permalink
Merge branch 'pci/host-faraday' into next
Browse files Browse the repository at this point in the history
* pci/host-faraday:
  PCI: faraday: Fix wrong pointer passed to PTR_ERR()
  • Loading branch information
Bjorn Helgaas committed Nov 14, 2017
2 parents f21bfb5 + b3c433e commit 807dcfe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/pci/host/pci-ftpci100.c
Original file line number Diff line number Diff line change
@@ -481,7 +481,7 @@ static int faraday_pci_probe(struct platform_device *pdev)
}
p->bus_clk = devm_clk_get(dev, "PCICLK");
if (IS_ERR(p->bus_clk))
return PTR_ERR(clk);
return PTR_ERR(p->bus_clk);
ret = clk_prepare_enable(p->bus_clk);
if (ret) {
dev_err(dev, "could not prepare PCICLK\n");

0 comments on commit 807dcfe

Please sign in to comment.