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

Commit d311c662 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: Fix data types"

parents 100dfff0 5c4382f4

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

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int msm_csid_release(struct csid_device *csid_dev) 
	return 0;

}



static long msm_csid_cmd(struct csid_device *csid_dev, void *arg)

static int32_t msm_csid_cmd(struct csid_device *csid_dev, void *arg)

{

	int rc = 0;

	struct csid_cfg_data *cdata = (struct csid_cfg_data *)arg;

drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ static int msm_csiphy_release(struct csiphy_device *csiphy_dev, void *arg) 


#endif



static long msm_csiphy_cmd(struct csiphy_device *csiphy_dev, void *arg)

static int32_t msm_csiphy_cmd(struct csiphy_device *csiphy_dev, void *arg)

{

	int rc = 0;

	struct csiphy_cfg_data *cdata = (struct csiphy_cfg_data *)arg;

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

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ int32_t gc0339_config(struct msm_sensor_ctrl_t *s_ctrl, 
	void __user *argp)

{

	struct sensorb_cfg_data *cdata = (struct sensorb_cfg_data *)argp;

	long rc = 0;

	int32_t rc = 0;

	int32_t i = 0;

	mutex_lock(s_ctrl->msm_sensor_mutex);

	switch (cdata->cfgtype) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1753,7 +1753,7 @@ int32_t hi256_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, 
	void __user *argp)

{

	struct sensorb_cfg_data *cdata = (struct sensorb_cfg_data *)argp;

	long rc = 0;

	int32_t rc = 0;

	int32_t i = 0;

	mutex_lock(s_ctrl->msm_sensor_mutex);

	CDBG("%s:%d %s cfgtype = %d\n", __func__, __LINE__,

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

+4 −4
Original line number Diff line number Diff line
@@ -563,8 +563,8 @@ static long msm_sensor_subdev_ioctl(struct v4l2_subdev *sd, 
int msm_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, void __user *argp)

{

	struct sensorb_cfg_data *cdata = (struct sensorb_cfg_data *)argp;

	long rc = 0;

	int i = 0;

	int32_t rc = 0;

	int32_t i = 0;

	mutex_lock(s_ctrl->msm_sensor_mutex);

	CDBG("%s:%d %s cfgtype = %d\n", __func__, __LINE__,

		s_ctrl->sensordata->sensor_name, cdata->cfgtype);
@@ -958,7 +958,7 @@ int msm_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, void __user *argp) 


			rc = s_ctrl->func_tbl->sensor_power_up(s_ctrl);

			if (rc < 0) {

				pr_err("%s:%d failed rc %ld\n", __func__,

				pr_err("%s:%d failed rc %d\n", __func__,

					__LINE__, rc);

				break;

			}
@@ -985,7 +985,7 @@ int msm_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, void __user *argp) 


			rc = s_ctrl->func_tbl->sensor_power_down(s_ctrl);

			if (rc < 0) {

				pr_err("%s:%d failed rc %ld\n", __func__,

				pr_err("%s:%d failed rc %d\n", __func__,

					__LINE__, rc);

				break;

			}