Merge "msm: camera: isp: protect controllable output stream frame skip" (5a2cf19e) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1778,6 +1778,10 @@ int msm_isp_update_axi_stream(struct vfe_device vfe_dev, void arg)
	uint32_t framedrop_period =		uint32_t framedrop_period =
	msm_isp_get_framedrop_period(		msm_isp_get_framedrop_period(
	update_info->skip_pattern);		update_info->skip_pattern);
			if (stream_info->controllable_output) {
			pr_err("Controllable output streams does not support custom frame skip pattern\n");
			return -EINVAL;
			}
	if (update_info->skip_pattern == SKIP_ALL)		if (update_info->skip_pattern == SKIP_ALL)
	stream_info->framedrop_pattern = 0x0;		stream_info->framedrop_pattern = 0x0;
	else		else