| Message ID | 1504201930-3617-1-git-send-email-fabio.estevam@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
(CC'ed Joao Pinto) On Thursday, August 31, 2017 1:52 PM, Fabio Estevam wrote: > > platform_get_irq() returns a negative number on failure, so > adjust the logic to detect such condition and propagate > the real error value on failure. > > Cc: Jingoo Han <jingoohan1@gmail.com> > Reported-by: Bjorn Helgaas <helgaas@kernel.org> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Jingoo Han <jingoohan1@gmail.com> Best regards, Jingoo Han > --- > drivers/pci/dwc/pci-exynos.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/dwc/pci-exynos.c b/drivers/pci/dwc/pci-exynos.c > index f77f872..5596fde 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, > -- > 2.7.4
On Thu, Aug 31, 2017 at 02:52:01PM -0300, Fabio Estevam wrote: > platform_get_irq() returns a negative number on failure, so > adjust the logic to detect such condition and propagate > the real error value on failure. > > Cc: Jingoo Han <jingoohan1@gmail.com> > Reported-by: Bjorn Helgaas <helgaas@kernel.org> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Thanks, Fabio. I applied all these on their respective branches for v4.14, with the acks received so far. > --- > drivers/pci/dwc/pci-exynos.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/dwc/pci-exynos.c b/drivers/pci/dwc/pci-exynos.c > index f77f872..5596fde 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, > -- > 2.7.4 >
diff --git a/drivers/pci/dwc/pci-exynos.c b/drivers/pci/dwc/pci-exynos.c index f77f872..5596fde 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,
platform_get_irq() returns a negative number on failure, so adjust the logic to detect such condition and propagate the real error value on failure. Cc: Jingoo Han <jingoohan1@gmail.com> Reported-by: Bjorn Helgaas <helgaas@kernel.org> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> --- drivers/pci/dwc/pci-exynos.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)