Merge "msm-camera: sensor: Fixing kernel crash during i2c read" (27d09a21) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c

+13 −3

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
		@@ -584,7 +584,12 @@ static int msm_sensor_config32(struct msm_sensor_ctrl_t *s_ctrl,
		pr_err("%s:%d: i2c_read failed\n", __func__, __LINE__);
		break;
		}
		read_config_ptr->data = local_data;
		if (copy_to_user(&read_config_ptr->data,
		&local_data, sizeof(local_data))) {
		pr_err("%s:%d failed\n", __func__, __LINE__);
		rc = -EFAULT;
		break;
		}
		break;
		}
		case CFG_SLAVE_WRITE_I2C_ARRAY: {
		@@ -1098,7 +1103,12 @@ int msm_sensor_config(struct msm_sensor_ctrl_t s_ctrl, void __user argp)
		pr_err("%s:%d: i2c_read failed\n", __func__, __LINE__);
		break;
		}
		read_config_ptr->data = local_data;
		if (copy_to_user(&read_config_ptr->data,
		&local_data, sizeof(local_data))) {
		pr_err("%s:%d failed\n", __func__, __LINE__);
		rc = -EFAULT;
		break;
		}
		break;
		}
		case CFG_SLAVE_WRITE_I2C_ARRAY: {