p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'pci/host-faraday' into next 

* pci/host-faraday:
  PCI: faraday: Fix wrong pointer passed to PTR_ERR()
This commit is contained in:
Bjorn Helgaas 2017-11-14 12:11:29 -06:00
parent f21bfb5625 b3c433efb8
commit 807dcfee42
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/host/pci-ftpci100.c
View File

@ -481,7 +481,7 @@ static int faraday_pci_probe(struct platform_device *pdev)
} }
p->bus_clk = devm_clk_get(dev, "PCICLK"); p->bus_clk = devm_clk_get(dev, "PCICLK");
if (IS_ERR(p->bus_clk)) if (IS_ERR(p->bus_clk))
return PTR_ERR(clk); return PTR_ERR(p->bus_clk);
ret = clk_prepare_enable(p->bus_clk); ret = clk_prepare_enable(p->bus_clk);
if (ret) { if (ret) {
dev_err(dev, "could not prepare PCICLK\n"); dev_err(dev, "could not prepare PCICLK\n");