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

Commit f7e3bd97 authored by Suresh Vankadara's avatar Suresh Vankadara Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sensor: Fix uninitialized vars" into dev/msm-4.14-camx

parents 4a78797a cd6a404c

drivers/media/platform/msm/ais/cam_sensor_module/cam_actuator/cam_actuator_core.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl, 
	size_t   len_of_buff = 0;

	uint32_t *offset = NULL;

	uint32_t *cmd_buf = NULL;

	uint64_t generic_ptr;

	uint64_t generic_ptr = 0;

	struct common_header      *cmm_hdr = NULL;

	struct cam_control        *ioctl_ctrl = NULL;

	struct cam_packet         *csl_packet = NULL;

drivers/media/platform/msm/ais/cam_sensor_module/cam_csiphy/cam_csiphy_core.c

+2 −2
Original line number Diff line number Diff line
@@ -157,12 +157,12 @@ int32_t cam_cmd_buf_parser(struct csiphy_device *csiphy_dev, 
	struct cam_config_dev_cmd *cfg_dev)

{

	int32_t                 rc = 0;

	uint64_t                generic_ptr;

	uint64_t                generic_ptr = 0;

	struct cam_packet       *csl_packet = NULL;

	struct cam_cmd_buf_desc *cmd_desc = NULL;

	uint32_t                *cmd_buf = NULL;

	struct cam_csiphy_info  *cam_cmd_csiphy_info = NULL;

	size_t                  len;

	size_t                  len = 0;



	if (!cfg_dev || !csiphy_dev) {

		CAM_ERR(CAM_CSIPHY, "Invalid Args");

drivers/media/platform/msm/ais/cam_sensor_module/cam_sensor/cam_sensor_core.c

+11 −7
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl, 
	void *arg)

{

	int32_t rc = 0;

	uint64_t generic_ptr;

	uint64_t generic_ptr = 0;

	struct cam_control *ioctl_ctrl = NULL;

	struct cam_packet *csl_packet = NULL;

	struct cam_cmd_buf_desc *cmd_desc = NULL;
@@ -455,13 +455,13 @@ int32_t cam_handle_cmd_buffers_for_probe(void *cmd_buf, 


int32_t cam_handle_mem_ptr(uint64_t handle, struct cam_sensor_ctrl_t *s_ctrl)

{

	int rc = 0, i;

	int rc = 0, i = 0;

	void *packet = NULL, *cmd_buf1 = NULL;

	uint32_t *cmd_buf;

	void *ptr;

	size_t len;

	struct cam_packet *pkt;

	struct cam_cmd_buf_desc *cmd_desc;

	uint32_t *cmd_buf = NULL;

	void *ptr = NULL;

	size_t len = 0;

	struct cam_packet *pkt = NULL;

	struct cam_cmd_buf_desc *cmd_desc = NULL;



	rc = cam_mem_get_cpu_buf(handle,

		(uint64_t *)&packet, &len);
@@ -470,6 +470,10 @@ int32_t cam_handle_mem_ptr(uint64_t handle, struct cam_sensor_ctrl_t *s_ctrl) 
		return -EINVAL;

	}

	pkt = (struct cam_packet *)packet;

	if (pkt == NULL) {

		CAM_ERR(CAM_SENSOR, "Invalid packet address");

		return -EINVAL;

	}

	cmd_desc = (struct cam_cmd_buf_desc *)

		((uint32_t *)&pkt->payload + pkt->cmd_buf_offset/4);

	if (cmd_desc == NULL) {