Skip to contentSkip to conversation

PCI: keystone: Fix error return code in ks_add_pcie_port()

PATCH New Wei Yongjun 3 participants 3 messages Jul 28, 2016 – Aug 22, 2016 PCI

lore
Share & tools
lore

Wei Yongjun

author
#0 lore raw

PATCH 1/1 PCI: keystone: Fix error return code in ks_add_pcie_port()

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 <[email protected]>
---
 drivers/pci/host/pci-keystone.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/pci/host/pci-keystone.c +3 -2
index 8ba2883..82b461b 100644
@@ -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;
#1 lore raw

PATCH 1/1 PCI: keystone: Fix error return code in ks_add_pcie_port()

Quoted 15 lines · Wei Yongjun

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 <[email protected]>
---
 drivers/pci/host/pci-keystone.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/pci/host/pci-keystone.c +0 -0
index 8ba2883..82b461b 100644
@@ -334,8 +334,9 @@ static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie,
 	if (ks_pcie->error_irq <= 0)

drivers/pci/host/pci-keystone.c static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie, · line 342

Quoted 10 lines
drivers/pci/host/pci-keystone.c +3 -2
 		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 <[email protected]>
Signature · 2 lines
Murali Karicheri
Linux Kernel, Keystone
#2 lore raw

PATCH 1/1 PCI: keystone: Fix error return code in ks_add_pcie_port()

In reply to Wei Yongjun
Quoted 4 lines · Wei Yongjun

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 <[email protected]>

Applied with Murali's ack to pci/host-keystone for v4.9, thanks!

Quoted 25 lines
---
 drivers/pci/host/pci-keystone.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/pci/host/pci-keystone.c +3 -3
index 8ba2883..82b461b 100644
@@ -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 at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html