]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[SCSI] qla4xxx: don't free NULL dma pool
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 30 Jan 2013 07:07:31 +0000 (10:07 +0300)
committerJames Bottomley <JBottomley@Parallels.com>
Fri, 22 Feb 2013 11:24:22 +0000 (11:24 +0000)
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>
drivers/scsi/qla4xxx/ql4_mbx.c

index 81e738d61ec02073580981ef85d12e2c016402ac..160d336972164bacaad1fe8722f5184464db2c32 100644 (file)
@@ -1420,10 +1420,8 @@ int qla4xxx_get_chap(struct scsi_qla_host *ha, char *username, char *password,
        dma_addr_t chap_dma;
 
        chap_table = dma_pool_alloc(ha->chap_dma_pool, GFP_KERNEL, &chap_dma);
-       if (chap_table == NULL) {
-               ret = -ENOMEM;
-               goto exit_get_chap;
-       }
+       if (chap_table == NULL)
+               return -ENOMEM;
 
        chap_size = sizeof(struct ql4_chap_table);
        memset(chap_table, 0, chap_size);