Merge "msm: cpp: Fix compat code error" (cd86aeb2) · Commits · e / devices / android_kernel_sony_msm8994

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -1747,7 +1747,7 @@ long msm_cpp_subdev_ioctl(struct v4l2_subdev *sd,
		memcpy(u_stream_buff_info, ioctl_ptr->ioctl_ptr,
		ioctl_ptr->len);
		} else
		#else
		#endif
		{
		rc = (copy_from_user(u_stream_buff_info,
		(void __user *)ioctl_ptr->ioctl_ptr,
		@@ -1759,7 +1759,6 @@ long msm_cpp_subdev_ioctl(struct v4l2_subdev *sd,
		return -EINVAL;
		}
		}
		#endif
		if (u_stream_buff_info->num_buffs == 0) {
		pr_err("%s:%d: Invalid number of buffers\n", __func__,
		__LINE__);