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

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

Merge "msm: camera: Initialize the structure with default values" into dev/msm-4.9-camx

parents ea7e56a7 c22f42a3

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

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ int32_t cam_actuator_driver_cmd(struct cam_actuator_ctrl_t *a_ctrl, 
	}

		break;

	case CAM_QUERY_CAP: {

		struct cam_actuator_query_cap actuator_cap;

		struct cam_actuator_query_cap actuator_cap = {0};



		actuator_cap.slot_info = a_ctrl->id;

		if (copy_to_user((void __user *) cmd->handle, &actuator_cap,

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

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ int32_t cam_csiphy_core_cfg(void *phy_dev, 
	}

		break;

	case CAM_QUERY_CAP: {

		struct cam_csiphy_query_cap csiphy_cap;

		struct cam_csiphy_query_cap csiphy_cap = {0};



		cam_csiphy_query_cap(csiphy_dev, &csiphy_cap);

		if (copy_to_user((void __user *)cmd->handle,