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

Commit 98d22013 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: copy move focus result to user space"

parents c644f22a b17d7f61

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

+21 −1
Original line number Diff line number Diff line
@@ -898,6 +898,7 @@ static long msm_actuator_subdev_do_ioctl( 
		(struct msm_actuator_cfg_data32 *)arg;

	struct msm_actuator_cfg_data actuator_data;

	void *parg = arg;

	long rc;



	switch (cmd) {

	case VIDIOC_MSM_ACTUATOR_CFG32:
@@ -1003,7 +1004,26 @@ static long msm_actuator_subdev_do_ioctl( 
			break;

		}

	}

	return msm_actuator_subdev_ioctl(sd, cmd, parg);



	rc = msm_actuator_subdev_ioctl(sd, cmd, parg);



	switch (cmd) {



	case VIDIOC_MSM_ACTUATOR_CFG:



		switch (u32->cfgtype) {



		case CFG_SET_DEFAULT_FOCUS:

		case CFG_MOVE_FOCUS:

			u32->cfg.move.curr_lens_pos =

				actuator_data.cfg.move.curr_lens_pos;

			break;

		default:

			break;

		}

	}



	return rc;

}



static long msm_actuator_subdev_fops_ioctl(struct file *file, unsigned int cmd,