Merge "msm: camera_v2: cpp: check event queue for NULL" (7f528a8b) · Commits · e / devices / android_kernel_sony_msm8994

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -1691,6 +1691,11 @@ long msm_cpp_subdev_ioctl(struct v4l2_subdev *sd,
		struct msm_cpp_frame_info_t *process_frame;
		CPP_DBG("VIDIOC_MSM_CPP_GET_EVENTPAYLOAD\n");
		event_qcmd = msm_dequeue(queue, list_eventdata);
		if (!event_qcmd) {
		pr_err("no queue cmd available");
		mutex_unlock(&cpp_dev->mutex);
		return -EINVAL;
		}
		process_frame = event_qcmd->command;
		CPP_DBG("fid %d\n", process_frame->frame_id);
		if (copy_to_user((void __user *)ioctl_ptr->ioctl_ptr,