Commit 0dd9636f authored by Bjorn Helgaas's avatar Bjorn Helgaas

Merge branch 'pci/host-exynos' into next

* pci/host-exynos:
  PCI: exynos: Fix platform_get_irq() error handling
parents 51386202 1df5a487
...@@ -607,9 +607,9 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep, ...@@ -607,9 +607,9 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep,
int ret; int ret;
pp->irq = platform_get_irq(pdev, 1); pp->irq = platform_get_irq(pdev, 1);
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, exynos_pcie_irq_handler, ret = devm_request_irq(dev, pp->irq, exynos_pcie_irq_handler,
IRQF_SHARED, "exynos-pcie", ep); IRQF_SHARED, "exynos-pcie", ep);
...@@ -620,9 +620,9 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep, ...@@ -620,9 +620,9 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep,
if (IS_ENABLED(CONFIG_PCI_MSI)) { if (IS_ENABLED(CONFIG_PCI_MSI)) {
pp->msi_irq = platform_get_irq(pdev, 0); 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"); dev_err(dev, "failed to get msi irq\n");
return -ENODEV; return pp->msi_irq;
} }
ret = devm_request_irq(dev, pp->msi_irq, ret = devm_request_irq(dev, pp->msi_irq,
......
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