Merge "msm: jpeg: Fix the VBIF settings for 8962" (3f0d02d1) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ static void set_vbif_params(struct msm_jpeg_device *pgmn_dev,
		jpeg_vbif_base + JPEG_VBIF_OUT_AXI_AOOO);
		/*FE and WE QOS configuration need to be set when
		QOS RR arbitration is enabled*/
		if (pgmn_dev->hw_version == JPEG_8974_V2)
		if (pgmn_dev->hw_version != JPEG_8974_V1)
		writel_relaxed(0x00000003,
		jpeg_vbif_base + JPEG_VBIF_ROUND_ROBIN_QOS_ARB);
		else