Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf7d74c4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: check for correct I2C master device"

parents 1bb0fbee 2a612a5c

drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-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
@@ -493,7 +493,7 @@ static int32_t msm_cci_i2c_read_bytes(struct v4l2_subdev *sd, 
		return -EINVAL;

	}



	if (c_ctrl->cci_info->cci_i2c_master > MASTER_MAX

	if (c_ctrl->cci_info->cci_i2c_master >= MASTER_MAX

			|| c_ctrl->cci_info->cci_i2c_master < 0) {

		pr_err("%s:%d Invalid I2C master addr\n", __func__, __LINE__);

		return -EINVAL;
@@ -539,7 +539,7 @@ static int32_t msm_cci_i2c_write(struct v4l2_subdev *sd, 
	enum cci_i2c_master_t master;

	enum cci_i2c_queue_t queue = QUEUE_0;

	cci_dev = v4l2_get_subdevdata(sd);

	if (c_ctrl->cci_info->cci_i2c_master > MASTER_MAX

	if (c_ctrl->cci_info->cci_i2c_master >= MASTER_MAX

			|| c_ctrl->cci_info->cci_i2c_master < 0) {

		pr_err("%s:%d Invalid I2C master addr\n", __func__, __LINE__);

		return -EINVAL;