Merge "msm: camera: Fix various small issues in vpe driver" (9184e704) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1282,6 +1282,15 @@ static long msm_vpe_subdev_ioctl(struct v4l2_subdev *sd,
		return -EINVAL;
		}

		if ((u_stream_buff_info->num_buffs == 0) \|\|
		(u_stream_buff_info->num_buffs >
		MSM_CAMERA_MAX_STREAM_BUF)) {
		pr_err("%s:%d: Invalid number of buffers\n", __func__,
		__LINE__);
		kfree(u_stream_buff_info);
		mutex_unlock(&vpe_dev->mutex);
		return -EINVAL;
		}
		k_stream_buff_info.num_buffs = u_stream_buff_info->num_buffs;
		k_stream_buff_info.identity = u_stream_buff_info->identity;
		k_stream_buff_info.buffer_info =
		@@ -1425,6 +1434,7 @@ static long msm_vpe_subdev_do_ioctl(
		struct vpe_device *vpe_dev = v4l2_get_subdevdata(sd);
		struct msm_camera_v4l2_ioctl_t *ioctl_ptr = arg;
		struct msm_vpe_frame_info_t inst_info;
		memset(&inst_info, 0, sizeof(struct msm_vpe_frame_info_t));
		for (i = 0; i < MAX_ACTIVE_VPE_INSTANCE; i++) {
		if (vpe_dev->vpe_subscribe_list[i].vfh == vfh) {
		inst_info.inst_id = i;