diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:07 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:07 -0500 |
| commit | f90742cbfb51901307c30a3e99df314da79f73a5 (patch) | |
| tree | 521e0ce4ca2ad541f93ce1f4d1b8c72e30963257 /drivers/pci | |
| parent | 68e8fa46d185894b6d1fe7f2f71a8a83b442c633 (diff) | |
| parent | 343ce0cdfae16828d18e9228e26dd19ecc3a457f (diff) | |
Merge branch 'pci/host-spear13xx' into next
* pci/host-spear13xx:
PCI: spear13xx: Fix platform_get_irq() error handling
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/dwc/pcie-spear13xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/dwc/pcie-spear13xx.c b/drivers/pci/dwc/pcie-spear13xx.c index 52000bc34600..709189d23b31 100644 --- a/drivers/pci/dwc/pcie-spear13xx.c +++ b/drivers/pci/dwc/pcie-spear13xx.c @@ -201,9 +201,9 @@ static int spear13xx_add_pcie_port(struct spear13xx_pcie *spear13xx_pcie, int ret; pp->irq = platform_get_irq(pdev, 0); - if (!pp->irq) { + if (pp->irq < 0) { dev_err(dev, "failed to get irq\n"); - return -ENODEV; + return pp->irq; } ret = devm_request_irq(dev, pp->irq, spear13xx_pcie_irq_handler, IRQF_SHARED | IRQF_NO_THREAD, |