Merge "msm: sensor: correcting return value for get actuator info" (551e23a0) · Commits · e / devices / android_kernel_xiaomi_markw

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

+15 −8

Original line number	Diff line number	Diff line
		@@ -1396,7 +1396,7 @@ static int32_t msm_actuator_config(struct msm_actuator_ctrl_t *a_ctrl,
		{
		struct msm_actuator_cfg_data *cdata =
		(struct msm_actuator_cfg_data *)argp;
		int32_t rc = 0;
		int32_t rc = -EINVAL;
		mutex_lock(a_ctrl->actuator_mutex);
		CDBG("Enter\n");
		CDBG("%s type %d\n", __func__, cdata->cfgtype);
		@@ -1406,7 +1406,7 @@ static int32_t msm_actuator_config(struct msm_actuator_ctrl_t *a_ctrl,
		a_ctrl->actuator_state == ACT_DISABLE_STATE) {
		pr_err("actuator disabled %d\n", rc);
		mutex_unlock(a_ctrl->actuator_mutex);
		return -EINVAL;
		return rc;
		}

		switch (cdata->cfgtype) {
		@@ -1418,6 +1418,7 @@ static int32_t msm_actuator_config(struct msm_actuator_ctrl_t *a_ctrl,
		case CFG_GET_ACTUATOR_INFO:
		cdata->is_af_supported = 1;
		cdata->cfg.cam_name = a_ctrl->cam_name;
		rc = 0;
		break;

		case CFG_SET_ACTUATOR_INFO:
		@@ -1427,13 +1428,17 @@ static int32_t msm_actuator_config(struct msm_actuator_ctrl_t *a_ctrl,
		break;

		case CFG_SET_DEFAULT_FOCUS:
		rc = a_ctrl->func_tbl->actuator_set_default_focus(a_ctrl,
		&cdata->cfg.move);
		if (a_ctrl->func_tbl &&
		a_ctrl->func_tbl->actuator_set_default_focus)
		rc = a_ctrl->func_tbl->actuator_set_default_focus(
		a_ctrl, &cdata->cfg.move);
		if (rc < 0)
		pr_err("move focus failed %d\n", rc);
		break;

		case CFG_MOVE_FOCUS:
		if (a_ctrl->func_tbl &&
		a_ctrl->func_tbl->actuator_move_focus)
		rc = a_ctrl->func_tbl->actuator_move_focus(a_ctrl,
		&cdata->cfg.move);
		if (rc < 0)
		@@ -1446,6 +1451,8 @@ static int32_t msm_actuator_config(struct msm_actuator_ctrl_t *a_ctrl,
		break;

		case CFG_SET_POSITION:
		if (a_ctrl->func_tbl &&
		a_ctrl->func_tbl->actuator_set_position)
		rc = a_ctrl->func_tbl->actuator_set_position(a_ctrl,
		&cdata->cfg.setpos);
		if (rc < 0)