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

Commit fc38ad4f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sensor: Disable debug logs"

parents 3380d16c 2860a4b6

drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c

+2 −2
Original line number Diff line number Diff line
@@ -1409,7 +1409,7 @@ int msm_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, void __user *argp) 
				break;

			}

			s_ctrl->sensor_state = MSM_SENSOR_POWER_UP;

			pr_err("%s:%d sensor state %d\n", __func__, __LINE__,

			CDBG("%s:%d sensor state %d\n", __func__, __LINE__,

				s_ctrl->sensor_state);

		} else {

			rc = -EFAULT;
@@ -1439,7 +1439,7 @@ int msm_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, void __user *argp) 
				break;

			}

			s_ctrl->sensor_state = MSM_SENSOR_POWER_DOWN;

			pr_err("%s:%d sensor state %d\n", __func__, __LINE__,

			CDBG("%s:%d sensor state %d\n", __func__, __LINE__,

				s_ctrl->sensor_state);

		} else {

			rc = -EFAULT;

drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ static int32_t msm_sensor_driver_parse(struct msm_sensor_ctrl_t *s_ctrl) 


	/* Store sensor control structure in static database */

	g_sctrl[s_ctrl->id] = s_ctrl;

	pr_err("g_sctrl[%d] %p", s_ctrl->id, g_sctrl[s_ctrl->id]);

	CDBG("g_sctrl[%d] %p", s_ctrl->id, g_sctrl[s_ctrl->id]);



	return rc;