diff options
| author | Bjorn Helgaas | 2017-09-07 13:23:56 -0500 |
|---|---|---|
| committer | Bjorn Helgaas | 2017-09-07 13:23:56 -0500 |
| commit | 0dd9636f97daa346b514402782a782c979b0a454 (patch) | |
| tree | 9c6585c28208222842d56b76b28a0c6975ff37cd /drivers/pci | |
| parent | 51386202a5948a024bdabb4318f7da362d514988 (diff) | |
| parent | 1df5a487c8b338105930310eb9a876d9ad1646cb (diff) | |
Merge branch 'pci/host-exynos' into next
* pci/host-exynos:
PCI: exynos: Fix platform_get_irq() error handling
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/dwc/pci-exynos.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/dwc/pci-exynos.c b/drivers/pci/dwc/pci-exynos.c index f77f872e8b78..5596fdedbb94 100644 --- a/drivers/pci/dwc/pci-exynos.c +++ b/drivers/pci/dwc/pci-exynos.c @@ -607,9 +607,9 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep, int ret; pp->irq = platform_get_irq(pdev, 1); - 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, exynos_pcie_irq_handler, IRQF_SHARED, "exynos-pcie", ep); @@ -620,9 +620,9 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep, if (IS_ENABLED(CONFIG_PCI_MSI)) { pp->msi_irq = platform_get_irq(pdev, 0); - if (!pp->msi_irq) { + if (pp->msi_irq < 0) { dev_err(dev, "failed to get msi irq\n"); - return -ENODEV; + return pp->msi_irq; } ret = devm_request_irq(dev, pp->msi_irq, |