Commit f90742cb authored by Bjorn Helgaas's avatar Bjorn Helgaas

Merge branch 'pci/host-spear13xx' into next

* pci/host-spear13xx:
  PCI: spear13xx: Fix platform_get_irq() error handling
parents 68e8fa46 343ce0cd
...@@ -201,9 +201,9 @@ static int spear13xx_add_pcie_port(struct spear13xx_pcie *spear13xx_pcie, ...@@ -201,9 +201,9 @@ static int spear13xx_add_pcie_port(struct spear13xx_pcie *spear13xx_pcie,
int ret; int ret;
pp->irq = platform_get_irq(pdev, 0); pp->irq = platform_get_irq(pdev, 0);
if (!pp->irq) { if (pp->irq < 0) {
dev_err(dev, "failed to get irq\n"); dev_err(dev, "failed to get irq\n");
return -ENODEV; return pp->irq;
} }
ret = devm_request_irq(dev, pp->irq, spear13xx_pcie_irq_handler, ret = devm_request_irq(dev, pp->irq, spear13xx_pcie_irq_handler,
IRQF_SHARED | IRQF_NO_THREAD, IRQF_SHARED | IRQF_NO_THREAD,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment