Merge "msm: camera: Fix Camera Monkey actuator crash" (b5130662) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -1303,6 +1303,15 @@ static int32_t msm_actuator_config(struct msm_actuator_ctrl_t *a_ctrl,
		mutex_lock(a_ctrl->actuator_mutex);
		CDBG("Enter\n");
		CDBG("%s type %d\n", __func__, cdata->cfgtype);

		if (cdata->cfgtype != CFG_ACTUATOR_INIT &&
		cdata->cfgtype != CFG_ACTUATOR_POWERUP &&
		a_ctrl->actuator_state == ACT_DISABLE_STATE) {
		pr_err("actuator disabled %d\n", rc);
		mutex_unlock(a_ctrl->actuator_mutex);
		return -EINVAL;
		}

		switch (cdata->cfgtype) {
		case CFG_ACTUATOR_INIT:
		rc = msm_actuator_init(a_ctrl);