aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-01-30 02:07:31 -0500
committerJames Bottomley <JBottomley@Parallels.com>2013-02-22 06:24:22 -0500
commit50e9291578886099888b8169459c6f97626ccbfc (patch)
tree73ebd2608393df83d10beaeead18c804aff79422
parent7c237c5f6d5c62724ccd82aecdcd1fd9bd71dc75 (diff)
[SCSI] qla4xxx: don't free NULL dma pool
The error path calls dma_pool_free() on this path but "chap_table" is NULL and "chap_dma" is uninitialized. It's cleaner to just return directly. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--drivers/scsi/qla4xxx/ql4_mbx.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 81e738d61ec0..160d33697216 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -1420,10 +1420,8 @@ int qla4xxx_get_chap(struct scsi_qla_host *ha, char *username, char *password,
1420 dma_addr_t chap_dma; 1420 dma_addr_t chap_dma;
1421 1421
1422 chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma); 1422 chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
1423 if (chap_table == NULL) { 1423 if (chap_table == NULL)
1424 ret = -ENOMEM; 1424 return -ENOMEM;
1425 goto exit_get_chap;
1426 }
1427 1425
1428 chap_size = sizeof(struct ql4_chap_table); 1426 chap_size = sizeof(struct ql4_chap_table);
1429 memset(chap_table, 0, chap_size); 1427 memset(chap_table, 0, chap_size);