summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-09-07 13:23:54 -0500
committerBjorn Helgaas <bhelgaas@google.com>2017-09-07 13:23:54 -0500
commit199a0253e39dc62f419de1d00a7c7a16f4b0f720 (patch)
tree332229f6ed5b0f8198f77197463e64d3f48ad89f /drivers/pci
parent9627804be4c17149e2c78c96b8307d27eb8992dc (diff)
parent16df7cdb9e9dfc459b5749f8139d1e58fb5cf649 (diff)
Merge branch 'pci/host-artpec6' into next
* pci/host-artpec6: PCI: artpec6: Fix platform_get_irq() error handling
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/dwc/pcie-artpec6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/dwc/pcie-artpec6.c b/drivers/pci/dwc/pcie-artpec6.c
index 01c6f7823672..d8782c1451a4 100644
--- a/drivers/pci/dwc/pcie-artpec6.c
+++ b/drivers/pci/dwc/pcie-artpec6.c
@@ -207,9 +207,9 @@ static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie,
if (IS_ENABLED(CONFIG_PCI_MSI)) {
pp->msi_irq = platform_get_irq_byname(pdev, "msi");
- if (pp->msi_irq <= 0) {
+ 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,