Merge "msm: camera: fix stream size for the UB allocation" (41335ac7) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

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

+3 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -207,7 +207,7 @@ static uint32_t msm_isp_axi_get_plane_size(
		plane_cfg[plane_idx].output_width;
		else
		size = plane_cfg[plane_idx].output_height *
		plane_cfg[plane_idx].output_width / 2;
		plane_cfg[plane_idx].output_width;
		break;
		case V4L2_PIX_FMT_NV14:
		case V4L2_PIX_FMT_NV41:
		@@ -216,7 +216,7 @@ static uint32_t msm_isp_axi_get_plane_size(
		plane_cfg[plane_idx].output_width;
		else
		size = plane_cfg[plane_idx].output_height *
		plane_cfg[plane_idx].output_width / 8;
		plane_cfg[plane_idx].output_width;
		break;
		case V4L2_PIX_FMT_NV16:
		case V4L2_PIX_FMT_NV61: