Merge "msm: camera: ispif: Validate vfe_intf parameter" (eb978953) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c

+3 −8

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2015, 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
		@@ -61,8 +61,8 @@ static void msm_ispif_io_dump_reg(struct ispif_device *ispif)
		static inline int msm_ispif_is_intf_valid(uint32_t csid_version,
		uint8_t intf_type)
		{
		return (csid_version <= CSID_VERSION_V22 && intf_type != VFE0) ?
		false : true;
		return ((csid_version <= CSID_VERSION_V22 && intf_type != VFE0) \|\|
		(intf_type >= VFE_MAX)) ? false : true;
		}

		static struct msm_cam_clk_info ispif_8626_reset_clk_info[] = {
		@@ -593,11 +593,6 @@ static int msm_ispif_config(struct ispif_device *ispif,

		for (i = 0; i < params->num; i++) {
		vfe_intf = params->entries[i].vfe_intf;
		if (vfe_intf >= VFE_MAX) {
		pr_err("%s: %d invalid i %d vfe_intf %d\n", __func__,
		__LINE__, i, vfe_intf);
		return -EINVAL;
		}
		if (!msm_ispif_is_intf_valid(ispif->csid_version,
		vfe_intf)) {
		pr_err("%s: invalid interface type\n", __func__);