diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-01-21 02:00:10 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-03-15 13:18:53 -0400 |
commit | b2a72ec32d0f499aaadf41264232517a12326df0 (patch) | |
tree | 833b52ec458e849ce50843631a84fabd80897a31 /drivers/scsi | |
parent | 2193b1b16cc7c690f74f917c50004dd00c99088e (diff) |
[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: e315cd28b9ef ('[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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 5feed53459f4..c673226a6547 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -2599,7 +2599,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
2599 | ha->flags.enable_64bit_addressing ? "enable" : | 2599 | ha->flags.enable_64bit_addressing ? "enable" : |
2600 | "disable"); | 2600 | "disable"); |
2601 | ret = qla2x00_mem_alloc(ha, req_length, rsp_length, &req, &rsp); | 2601 | ret = qla2x00_mem_alloc(ha, req_length, rsp_length, &req, &rsp); |
2602 | if (!ret) { | 2602 | if (ret) { |
2603 | ql_log_pci(ql_log_fatal, pdev, 0x0031, | 2603 | ql_log_pci(ql_log_fatal, pdev, 0x0031, |
2604 | "Failed to allocate memory for adapter, aborting.\n"); | 2604 | "Failed to allocate memory for adapter, aborting.\n"); |
2605 | 2605 | ||
@@ -3542,10 +3542,10 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len, | |||
3542 | else { | 3542 | else { |
3543 | qla2x00_set_reserved_loop_ids(ha); | 3543 | qla2x00_set_reserved_loop_ids(ha); |
3544 | ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0123, | 3544 | ql_dbg_pci(ql_dbg_init, ha->pdev, 0x0123, |
3545 | "loop_id_map=%p. \n", ha->loop_id_map); | 3545 | "loop_id_map=%p.\n", ha->loop_id_map); |
3546 | } | 3546 | } |
3547 | 3547 | ||
3548 | return 1; | 3548 | return 0; |
3549 | 3549 | ||
3550 | fail_async_pd: | 3550 | fail_async_pd: |
3551 | dma_pool_free(ha->s_dma_pool, ha->ex_init_cb, ha->ex_init_cb_dma); | 3551 | dma_pool_free(ha->s_dma_pool, ha->ex_init_cb, ha->ex_init_cb_dma); |