diff mbox series

scsi: fnic: fix error return code in fnic_probe()

Message ID 1607068060-31203-1-git-send-email-zhangchangzhong@huawei.com
State New
Headers show
Series scsi: fnic: fix error return code in fnic_probe() | expand

Commit Message

Zhang Changzhong Dec. 4, 2020, 7:47 a.m. UTC
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 5df6d737dd4b ("[SCSI] fnic: Add new Cisco PCI-Express FCoE HBA")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
---
 drivers/scsi/fnic/fnic_main.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Karan Tilak Kumar Dec. 7, 2020, 11:40 p.m. UTC | #1
Looks good to me.

Reviewed-by: Karan Tilak Kumar <kartilak@cisco.com>


Regards,
Karan

-----Original Message-----
From: Zhang Changzhong <zhangchangzhong@huawei.com> 

Sent: Thursday, December 3, 2020 11:48 PM
To: Satish Kharat (satishkh) <satishkh@cisco.com>; Sesidhar Baddela (sebaddel) <sebaddel@cisco.com>; Karan Tilak Kumar (kartilak) <kartilak@cisco.com>; James E.J. Bottomley <jejb@linux.ibm.com>; Martin K. Petersen <martin.petersen@oracle.com>; James Bottomley <James.Bottomley@HansenPartnership.com>; Mike Christie <michaelc@cs.wisc.edu>; Joe Eykholt <jeykholt@cisco.com>; Abhijeet Joglekar <abjoglek@cisco.com>
Cc: linux-scsi@vger.kernel.org; linux-kernel@vger.kernel.org
Subject: [PATCH] scsi: fnic: fix error return code in fnic_probe()

Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.

Fixes: 5df6d737dd4b ("[SCSI] fnic: Add new Cisco PCI-Express FCoE HBA")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

---
 drivers/scsi/fnic/fnic_main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c index 5f8a7ef..4f7befb 100644
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -740,6 +740,7 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	for (i = 0; i < FNIC_IO_LOCKS; i++)
 		spin_lock_init(&fnic->io_req_lock[i]);
 
+	err = -ENOMEM;
 	fnic->io_req_pool = mempool_create_slab_pool(2, fnic_io_req_cache);
 	if (!fnic->io_req_pool)
 		goto err_out_free_resources;
--
2.9.5
Martin K. Petersen Dec. 8, 2020, 1:31 a.m. UTC | #2
Zhang,

> Fix to return a negative error code from the error handling

> case instead of 0, as done elsewhere in this function.


Applied to 5.11/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering
Martin K. Petersen Dec. 9, 2020, 5:23 p.m. UTC | #3
On Fri, 4 Dec 2020 15:47:39 +0800, Zhang Changzhong wrote:

> Fix to return a negative error code from the error handling

> case instead of 0, as done elsewhere in this function.


Applied to 5.11/scsi-queue, thanks!

[1/1] scsi: fnic: fix error return code in fnic_probe()
      https://git.kernel.org/mkp/scsi/c/d4fc94fe6557

-- 
Martin K. Petersen	Oracle Linux Engineering
diff mbox series

Patch

diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
index 5f8a7ef..4f7befb 100644
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -740,6 +740,7 @@  static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	for (i = 0; i < FNIC_IO_LOCKS; i++)
 		spin_lock_init(&fnic->io_req_lock[i]);
 
+	err = -ENOMEM;
 	fnic->io_req_pool = mempool_create_slab_pool(2, fnic_io_req_cache);
 	if (!fnic->io_req_pool)
 		goto err_out_free_resources;