Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53772a2c authored by Seokmann Ju's avatar Seokmann Ju Committed by James Bottomley
Browse files

[SCSI] qla2xxx: fix panic caused by previous patch 



- this patch will fix a panic caused by omitted memory allocation for the nvram.

Signed-off-by: default avatarSeokmann Ju <seokmann.ju@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 142009a3

drivers/scsi/qla2xxx/qla_os.c

+14 −0
Original line number Diff line number Diff line
@@ -2154,6 +2154,19 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha) 
			}

		}



		/* Get memory for cached NVRAM */

		ha->nvram = kzalloc(MAX_NVRAM_SIZE, GFP_KERNEL);

		if (ha->nvram == NULL) {

			/* error */

			qla_printk(KERN_WARNING, ha,

			    "Memory Allocation failed - nvram cache\n");



			qla2x00_mem_free(ha);

			msleep(100);



			continue;

		}



		/* Done all allocations without any error. */

		status = 0;
@@ -2266,6 +2279,7 @@ qla2x00_mem_free(scsi_qla_host_t *ha) 
	ha->fw_dump_reading = 0;



	vfree(ha->optrom_buffer);

	kfree(ha->nvram);

}



/*