[SCSI] qla2xxx: fix error handling of qla2x00_mem_alloc()
qla2x00_mem_alloc() returns 1 on success and -ENOMEM on failure. On the
one hand the caller assumes non-zero is success but on the other hand
the caller also assumes that it returns an error code.
I've fixed it to return zero on success and a negative error code on
failure. This matches the documentation as well.
[jejb: checkpatch fix]
Fixes: e315cd28b9
('[SCSI] qla2xxx: Code changes for qla data structure refactoring')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Родитель
2193b1b16c
Коммит
b2a72ec32d
|
@ -2599,7 +2599,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
ha->flags.enable_64bit_addressing ? "enable" :
|
||||
"disable");
|
||||
ret = qla2x00_mem_alloc(ha, req_length, rsp_length, &req, &rsp);
|
||||
if (!ret) {
|
||||
if (ret) {
|
||||
ql_log_pci(ql_log_fatal, pdev, 0x0031,
|
||||
"Failed to allocate memory for adapter, aborting.\n");
|
||||
|
||||
|
@ -3542,10 +3542,10 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,
|
|||
else {
|
||||
qla2x00_set_reserved_loop_ids(ha);
|
||||
ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0123,
|
||||
"loop_id_map=%p. \n", ha->loop_id_map);
|
||||
"loop_id_map=%p.\n", ha->loop_id_map);
|
||||
}
|
||||
|
||||
return 1;
|
||||
return 0;
|
||||
|
||||
fail_async_pd:
|
||||
dma_pool_free(ha->s_dma_pool, ha->ex_init_cb, ha->ex_init_cb_dma);
|
||||
|
|
Загрузка…
Ссылка в новой задаче