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

Commit 758cb7e3 authored by Viswanadha Raju Thotakura's avatar Viswanadha Raju Thotakura Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sensor: Modify log type" into dev/msm-4.14-camx

parents 9ecd2916 801cb68a

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

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl, 
		CAM_SENSOR_PACKET_OPCODE_SENSOR_INITIAL_CONFIG &&

		csl_packet->header.request_id <= s_ctrl->last_flush_req

		&& s_ctrl->last_flush_req != 0) {

		CAM_DBG(CAM_SENSOR,

		CAM_ERR(CAM_SENSOR,

			"reject request %lld, last request to flush %lld",

			csl_packet->header.request_id, s_ctrl->last_flush_req);

		rc = -EINVAL;
@@ -877,7 +877,7 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl, 
	case CAM_CONFIG_DEV: {

		rc = cam_sensor_i2c_pkt_parse(s_ctrl, arg);

		if (rc < 0) {

			CAM_ERR(CAM_SENSOR, "Failed CCI Config: %d", rc);

			CAM_ERR(CAM_SENSOR, "Failed i2c pkt parse: %d", rc);

			goto release_mutex;

		}

		if (s_ctrl->i2c_data.init_settings.is_settings_valid &&