diff options
author | Wei Yongjun <weiyongjun1@huawei.com> | 2018-01-17 07:42:41 -0500 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2018-01-22 20:03:56 -0500 |
commit | e89cabf26e1cdd5c612b6c21547b3e79b4ac1038 (patch) | |
tree | 99d14fa16edf8991348f71ebf21348c7cd2e52ab | |
parent | 3f884a0a8bdf28cfd1e9987d54d83350096cdd46 (diff) |
scsi: qedf: Fix error return code in __qedf_probe()
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>
Acked-by: Chad Dupuis <chad.dupuis@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r-- | drivers/scsi/qedf/qedf_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c index 7c0064500cc5..4809debc6110 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) | |||
3126 | qedf->cmd_mgr = qedf_cmd_mgr_alloc(qedf); | 3126 | qedf->cmd_mgr = qedf_cmd_mgr_alloc(qedf); |
3127 | if (!qedf->cmd_mgr) { | 3127 | if (!qedf->cmd_mgr) { |
3128 | QEDF_ERR(&(qedf->dbg_ctx), "Failed to allocate cmd mgr.\n"); | 3128 | QEDF_ERR(&(qedf->dbg_ctx), "Failed to allocate cmd mgr.\n"); |
3129 | rc = -ENOMEM; | ||
3129 | goto err5; | 3130 | goto err5; |
3130 | } | 3131 | } |
3131 | 3132 | ||
@@ -3149,6 +3150,7 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) | |||
3149 | create_workqueue(host_buf); | 3150 | create_workqueue(host_buf); |
3150 | if (!qedf->ll2_recv_wq) { | 3151 | if (!qedf->ll2_recv_wq) { |
3151 | QEDF_ERR(&(qedf->dbg_ctx), "Failed to LL2 workqueue.\n"); | 3152 | QEDF_ERR(&(qedf->dbg_ctx), "Failed to LL2 workqueue.\n"); |
3153 | rc = -ENOMEM; | ||
3152 | goto err7; | 3154 | goto err7; |
3153 | } | 3155 | } |
3154 | 3156 | ||
@@ -3192,6 +3194,7 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) | |||
3192 | if (!qedf->timer_work_queue) { | 3194 | if (!qedf->timer_work_queue) { |
3193 | QEDF_ERR(&(qedf->dbg_ctx), "Failed to start timer " | 3195 | QEDF_ERR(&(qedf->dbg_ctx), "Failed to start timer " |
3194 | "workqueue.\n"); | 3196 | "workqueue.\n"); |
3197 | rc = -ENOMEM; | ||
3195 | goto err7; | 3198 | goto err7; |
3196 | } | 3199 | } |
3197 | 3200 | ||