diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-11-14 12:11:29 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-11-14 12:11:29 -0600 |
| commit | 807dcfee426b407f7175fefc4c255594c6f257f5 (patch) | |
| tree | e198d2a123c5945827a6b9b38e3c4cb06a578a56 /drivers/pci | |
| parent | f21bfb5625c5278f5a48d307114eec2220ea6f79 (diff) | |
| parent | b3c433efb8a3d347ddc39b95606a6e7732e97649 (diff) | |
| download | lwn-807dcfee426b407f7175fefc4c255594c6f257f5.tar.gz lwn-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.c | 2 |
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"); |