Merge "msm: camera: cpp: Avoid cpp frame access during error" (4b1dc325) · Commits · e / devices / android_kernel_sony_msm8994

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -2871,10 +2871,13 @@ static long msm_cpp_subdev_fops_compat_ioctl(struct file *file,
		/* Configure the cpp frame */
		if (cpp_frame) {
		rc = msm_cpp_cfg_frame(cpp_dev, cpp_frame);
		/* Cpp_frame can be free'd by cfg_frame in error */
		if (rc >= 0) {
		k32_frame_info.output_buffer_info[0] =
		cpp_frame->output_buffer_info[0];
		k32_frame_info.output_buffer_info[1] =
		cpp_frame->output_buffer_info[1];
		}
		} else {
		pr_err("%s: Error getting frame\n", __func__);
		rc = -EINVAL;