Merge "msm: camera: sensor: Validate csid lane count" (450ae20a) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c

+8 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2011-2017, 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
		@@ -58,6 +58,7 @@
		#define TRUE 1
		#define FALSE 0

		#define MAX_LANE_COUNT 4
		#define CSID_TIMEOUT msecs_to_jiffies(100)

		#undef CDBG
		@@ -284,6 +285,12 @@ static int msm_csid_config(struct csid_device *csid_dev,
		csid_params->lane_assign);
		CDBG("%s csid_params phy_sel = %d\n", __func__,
		csid_params->phy_sel);
		if ((csid_params->lane_cnt == 0) \|\|
		(csid_params->lane_cnt > MAX_LANE_COUNT)) {
		pr_err("%s:%d invalid lane count = %d\n",
		__func__, __LINE__, csid_params->lane_cnt);
		return -EINVAL;
		}

		csid_dev->csid_lane_cnt = csid_params->lane_cnt;
		rc = msm_csid_reset(csid_dev);