diff mbox

[-next] scsi: qedf: Fix error return code in __qedf_probe()

Message ID 1516192961-52789-1-git-send-email-weiyongjun1@huawei.com (mailing list archive)
State Accepted
Headers show

Commit Message

Wei Yongjun Jan. 17, 2018, 12:42 p.m. UTC 
Fix to return error code -ENOMEM from the error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
 drivers/scsi/qedf/qedf_main.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Dupuis, Chad Jan. 17, 2018, 2:40 p.m. UTC | #1 
On Wed, 17 Jan 2018, 7:42am, Wei Yongjun wrote:

> Fix to return error code -ENOMEM from the error handling
> case instead of 0, as done elsewhere in this function.
> 
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> ---
>  drivers/scsi/qedf/qedf_main.c | 3 +++
>  1 file changed, 3 insertions(+)
> 

Yeah, we should be returning -ENOMEM in those cases.

Acked-by: Chad Dupuis <chad.dupuis@cavium.com>
Martin K. Petersen Jan. 18, 2018, 2:44 a.m. UTC | #2 
Wei,

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

Applied to 4.16/scsi-queue, thanks!
diff mbox

Patch

diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index 40800dd..ccd9a08 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -3126,6 +3126,7 @@  static int __qedf_probe(struct pci_dev *pdev, int mode)
 	qedf->cmd_mgr = qedf_cmd_mgr_alloc(qedf);
 	if (!qedf->cmd_mgr) {
 		QEDF_ERR(&(qedf->dbg_ctx), "Failed to allocate cmd mgr.\n");
+		rc = -ENOMEM;
 		goto err5;
 	}
 
@@ -3149,6 +3150,7 @@  static int __qedf_probe(struct pci_dev *pdev, int mode)
 		create_workqueue(host_buf);
 	if (!qedf->ll2_recv_wq) {
 		QEDF_ERR(&(qedf->dbg_ctx), "Failed to LL2 workqueue.\n");
+		rc = -ENOMEM;
 		goto err7;
 	}
 
@@ -3192,6 +3194,7 @@  static int __qedf_probe(struct pci_dev *pdev, int mode)
 	if (!qedf->timer_work_queue) {
 		QEDF_ERR(&(qedf->dbg_ctx), "Failed to start timer "
 			  "workqueue.\n");
+		rc = -ENOMEM;
 		goto err7;
 	}