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

Commit 56c3b2a1 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_v2: Use proper buffer index"

parents 0a90fdc9 d096a144

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+4 −0
Original line number Diff line number Diff line
@@ -3651,6 +3651,8 @@ static long msm_cpp_subdev_ioctl(struct v4l2_subdev *sd, 
		} else {

			ioctl_cmd = VIDIOC_MSM_BUF_MNGR_IOCTL_CMD;

			idx = MSM_CAMERA_BUF_MNGR_IOCTL_ID_GET_BUF_BY_IDX;

			buff_mgr_info.index =

				frame_info.output_buffer_info[0].index;

		}

		rc = msm_cpp_buffer_ops(cpp_dev, ioctl_cmd, idx,

			&buff_mgr_info);
@@ -4364,6 +4366,8 @@ static long msm_cpp_subdev_fops_compat_ioctl(struct file *file, 
		memset(&k64_frame_info, 0, sizeof(k64_frame_info));

		k64_frame_info.identity = k32_frame_info.identity;

		k64_frame_info.frame_id = k32_frame_info.frame_id;

		k64_frame_info.output_buffer_info[0].index =

			k32_frame_info.output_buffer_info[0].index;



		kp_ioctl.ioctl_ptr = (__force void __user *)&k64_frame_info;