| Message ID | 1469722578-14863-1-git-send-email-weiyj.lk@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/28/2016 12:16 PM, Wei Yongjun wrote: > Fix to return a negative error code from the request IRQ error > handling case instead of 0, as done elsewhere in this function. > > Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> > --- > drivers/pci/host/pci-keystone.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c > index 8ba2883..82b461b 100644 > --- a/drivers/pci/host/pci-keystone.c > +++ b/drivers/pci/host/pci-keystone.c > @@ -334,8 +334,9 @@ static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie, > if (ks_pcie->error_irq <= 0) > dev_info(&pdev->dev, "no error IRQ defined\n"); > else { > - if (request_irq(ks_pcie->error_irq, pcie_err_irq_handler, > - IRQF_SHARED, "pcie-error-irq", ks_pcie) < 0) { > + ret = request_irq(ks_pcie->error_irq, pcie_err_irq_handler, > + IRQF_SHARED, "pcie-error-irq", ks_pcie); > + if (ret < 0) { > dev_err(&pdev->dev, "failed to request error IRQ %d\n", > ks_pcie->error_irq); > return ret; > Thanks Acked-By: Murali Karicheri <m-karicheri2@ti.com>
On Thu, Jul 28, 2016 at 04:16:18PM +0000, Wei Yongjun wrote: > Fix to return a negative error code from the request IRQ error > handling case instead of 0, as done elsewhere in this function. > > Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Applied with Murali's ack to pci/host-keystone for v4.9, thanks! > --- > drivers/pci/host/pci-keystone.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c > index 8ba2883..82b461b 100644 > --- a/drivers/pci/host/pci-keystone.c > +++ b/drivers/pci/host/pci-keystone.c > @@ -334,8 +334,9 @@ static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie, > if (ks_pcie->error_irq <= 0) > dev_info(&pdev->dev, "no error IRQ defined\n"); > else { > - if (request_irq(ks_pcie->error_irq, pcie_err_irq_handler, > - IRQF_SHARED, "pcie-error-irq", ks_pcie) < 0) { > + ret = request_irq(ks_pcie->error_irq, pcie_err_irq_handler, > + IRQF_SHARED, "pcie-error-irq", ks_pcie); > + if (ret < 0) { > dev_err(&pdev->dev, "failed to request error IRQ %d\n", > ks_pcie->error_irq); > return ret; > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c index 8ba2883..82b461b 100644 --- a/drivers/pci/host/pci-keystone.c +++ b/drivers/pci/host/pci-keystone.c @@ -334,8 +334,9 @@ static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie, if (ks_pcie->error_irq <= 0) dev_info(&pdev->dev, "no error IRQ defined\n"); else { - if (request_irq(ks_pcie->error_irq, pcie_err_irq_handler, - IRQF_SHARED, "pcie-error-irq", ks_pcie) < 0) { + ret = request_irq(ks_pcie->error_irq, pcie_err_irq_handler, + IRQF_SHARED, "pcie-error-irq", ks_pcie); + if (ret < 0) { dev_err(&pdev->dev, "failed to request error IRQ %d\n", ks_pcie->error_irq); return ret;
Fix to return a negative error code from the request IRQ error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> --- drivers/pci/host/pci-keystone.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)