From: Wei Yongjun <[email protected]> Fix to return a negative error code in the queues alloc error handling case instead of 0, as done elsewhere in this function. And also fix to return 0 from qla2x00_alloc_queues() when no error, otherwise this cause if (!qla2x00_alloc_queues(ha, req, rsp)) always be false.
Signed-off-by: Wei Yongjun <[email protected]> --- drivers/scsi/qla2xxx/qla_os.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 5307bf8..16fe011 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -344,7 +344,7 @@ static int qla2x00_alloc_queues(struct qla_hw_data *ha, struct req_que *req, ha->req_q_map[0] = req; set_bit(0, ha->rsp_qid_map); set_bit(0, ha->req_qid_map); - return 1; + return 0; fail_rsp_map: kfree(ha->req_q_map); @@ -2631,7 +2631,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) que_init: /* Alloc arrays of request and response ring ptrs */ - if (!qla2x00_alloc_queues(ha, req, rsp)) { + ret = qla2x00_alloc_queues(ha, req, rsp); + if (ret) { ql_log(ql_log_fatal, base_vha, 0x003d, "Failed to allocate memory for queue pointers..." "aborting.\n"); -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
