summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-11-14 19:11:29 +0100
committerBjorn Helgaas <bhelgaas@google.com>2017-11-14 19:11:29 +0100
commit807dcfee426b407f7175fefc4c255594c6f257f5 (patch)
treee198d2a123c5945827a6b9b38e3c4cb06a578a56 /drivers/pci
parentMerge branch 'pci/host-dra7xx' into next (diff)
parentPCI: faraday: Fix wrong pointer passed to PTR_ERR() (diff)
downloadlinux-807dcfee426b407f7175fefc4c255594c6f257f5.tar.xz
linux-807dcfee426b407f7175fefc4c255594c6f257f5.zip
Merge branch 'pci/host-faraday' into next
* pci/host-faraday: PCI: faraday: Fix wrong pointer passed to PTR_ERR()
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/host/pci-ftpci100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-ftpci100.c b/drivers/pci/host/pci-ftpci100.c
index 96028f01bc90..a19919c17d04 100644
--- a/drivers/pci/host/pci-ftpci100.c
+++ b/drivers/pci/host/pci-ftpci100.c
@@ -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");