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

Commit 5d0e5978 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: eeprom: Memory Allocation using vzalloc for larger data" into dev/msm-4.9-camx

parents 6d654032 64f03f3d

drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_core.c

+12 −12
Original line number Diff line number Diff line
@@ -315,8 +315,8 @@ int32_t cam_eeprom_parse_read_memory_map(struct device_node *of_node, 
power_down:

	cam_eeprom_power_down(e_ctrl);

data_mem_free:

	kfree(e_ctrl->cal_data.mapdata);

	kfree(e_ctrl->cal_data.map);

	vfree(e_ctrl->cal_data.mapdata);

	vfree(e_ctrl->cal_data.map);

	e_ctrl->cal_data.num_data = 0;

	e_ctrl->cal_data.num_map = 0;

	e_ctrl->cam_eeprom_state = CAM_EEPROM_ACQUIRE;
@@ -543,9 +543,9 @@ static int32_t cam_eeprom_init_pkt_parser(struct cam_eeprom_ctrl_t *e_ctrl, 
		(struct cam_eeprom_soc_private *)e_ctrl->soc_info.soc_private;

	struct cam_sensor_power_ctrl_t *power_info = &soc_private->power_info;



	e_ctrl->cal_data.map = kcalloc((MSM_EEPROM_MEMORY_MAP_MAX_SIZE *

		MSM_EEPROM_MAX_MEM_MAP_CNT),

		(sizeof(struct cam_eeprom_memory_map_t)), GFP_KERNEL);

	e_ctrl->cal_data.map = vzalloc((MSM_EEPROM_MEMORY_MAP_MAX_SIZE *

		MSM_EEPROM_MAX_MEM_MAP_CNT) *

		(sizeof(struct cam_eeprom_memory_map_t)));

	if (!e_ctrl->cal_data.map) {

		rc = -ENOMEM;

		CAM_ERR(CAM_EEPROM, "failed");
@@ -738,8 +738,8 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t *e_ctrl, void *arg) 
				return rc;

			}

			rc = cam_eeprom_get_cal_data(e_ctrl, csl_packet);

			kfree(e_ctrl->cal_data.mapdata);

			kfree(e_ctrl->cal_data.map);

			vfree(e_ctrl->cal_data.mapdata);

			vfree(e_ctrl->cal_data.map);

			e_ctrl->cal_data.num_data = 0;

			e_ctrl->cal_data.num_map = 0;

			CAM_DBG(CAM_EEPROM,
@@ -754,7 +754,7 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t *e_ctrl, void *arg) 
		}



		e_ctrl->cal_data.mapdata =

			kzalloc(e_ctrl->cal_data.num_data, GFP_KERNEL);

			vzalloc(e_ctrl->cal_data.num_data);

		if (!e_ctrl->cal_data.mapdata) {

			rc = -ENOMEM;

			CAM_ERR(CAM_EEPROM, "failed");
@@ -779,8 +779,8 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t *e_ctrl, void *arg) 
		rc = cam_eeprom_get_cal_data(e_ctrl, csl_packet);

		rc = cam_eeprom_power_down(e_ctrl);

		e_ctrl->cam_eeprom_state = CAM_EEPROM_ACQUIRE;

		kfree(e_ctrl->cal_data.mapdata);

		kfree(e_ctrl->cal_data.map);

		vfree(e_ctrl->cal_data.mapdata);

		vfree(e_ctrl->cal_data.map);

		kfree(power_info->power_setting);

		kfree(power_info->power_down_setting);

		power_info->power_setting = NULL;
@@ -795,13 +795,13 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t *e_ctrl, void *arg) 
power_down:

	cam_eeprom_power_down(e_ctrl);

memdata_free:

	kfree(e_ctrl->cal_data.mapdata);

	vfree(e_ctrl->cal_data.mapdata);

error:

	kfree(power_info->power_setting);

	kfree(power_info->power_down_setting);

	power_info->power_setting = NULL;

	power_info->power_down_setting = NULL;

	kfree(e_ctrl->cal_data.map);

	vfree(e_ctrl->cal_data.map);

	e_ctrl->cal_data.num_data = 0;

	e_ctrl->cal_data.num_map = 0;

	e_ctrl->cam_eeprom_state = CAM_EEPROM_INIT;