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

Commit 2638d4f3 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sensor: Add error logs in case of wrong ioctl" into camera-kernel.lnx.4.0

parents 6e0357ec a5485a85

drivers/cam_sensor_module/cam_actuator/cam_actuator_dev.c

+8 −4
Original line number Diff line number Diff line
@@ -20,10 +20,13 @@ static long cam_actuator_subdev_ioctl(struct v4l2_subdev *sd, 
	switch (cmd) {

	case VIDIOC_CAM_CONTROL:

		rc = cam_actuator_driver_cmd(a_ctrl, arg);

		if (rc)

			CAM_ERR(CAM_ACTUATOR,

				"Failed for driver_cmd: %d", rc);

		break;

	default:

		CAM_ERR(CAM_ACTUATOR, "Invalid ioctl cmd");

		rc = -EINVAL;

		CAM_ERR(CAM_ACTUATOR, "Invalid ioctl cmd: %u", cmd);

		rc = -ENOIOCTLCMD;

		break;

	}

	return rc;
@@ -57,7 +60,8 @@ static long cam_actuator_init_subdev_do_ioctl(struct v4l2_subdev *sd, 
		break;

	default:

		CAM_ERR(CAM_ACTUATOR, "Invalid compat ioctl: %d", cmd);

		rc = -EINVAL;

		rc = -ENOIOCTLCMD;

		break;

	}



	if (!rc) {

drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.c

+9 −5
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ static long cam_csiphy_subdev_ioctl(struct v4l2_subdev *sd, 
	switch (cmd) {

	case VIDIOC_CAM_CONTROL:

		rc = cam_csiphy_core_cfg(csiphy_dev, arg);

		if (rc != 0) {

			CAM_ERR(CAM_CSIPHY, "in configuring the device");

			return rc;

		}

		if (rc)

			CAM_ERR(CAM_CSIPHY,

				"Failed in configuring the device: %d", rc);

		break;

	default:

		CAM_ERR(CAM_CSIPHY, "Wrong ioctl : %d", cmd);

		rc = -ENOIOCTLCMD;

		break;

	}
@@ -89,10 +89,14 @@ static long cam_csiphy_subdev_compat_ioctl(struct v4l2_subdev *sd, 
	switch (cmd) {

	case VIDIOC_CAM_CONTROL:

		rc = cam_csiphy_subdev_ioctl(sd, cmd, &cmd_data);

		if (rc)

			CAM_ERR(CAM_CSIPHY,

				"Failed in subdev_ioctl: %d", rc);

		break;

	default:

		CAM_ERR(CAM_CSIPHY, "Invalid compat ioctl cmd: %d", cmd);

		rc = -EINVAL;

		rc = -ENOIOCTLCMD;

		break;

	}



	if (!rc) {

drivers/cam_sensor_module/cam_eeprom/cam_eeprom_dev.c

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ static long cam_eeprom_subdev_ioctl(struct v4l2_subdev *sd, 
	switch (cmd) {

	case VIDIOC_CAM_CONTROL:

		rc = cam_eeprom_driver_cmd(e_ctrl, arg);

		if (rc)

			CAM_ERR(CAM_EEPROM,

				"Failed in Driver cmd: %d", rc);

		break;

	default:

		rc = -ENOIOCTLCMD;

drivers/cam_sensor_module/cam_flash/cam_flash_dev.c

+6 −2
Original line number Diff line number Diff line
@@ -251,11 +251,14 @@ static long cam_flash_subdev_ioctl(struct v4l2_subdev *sd, 
	case VIDIOC_CAM_CONTROL: {

		rc = cam_flash_driver_cmd(fctrl, arg,

			soc_private);

		if (rc)

			CAM_ERR(CAM_FLASH,

				"Failed in driver cmd: %d", rc);

		break;

	}

	default:

		CAM_ERR(CAM_FLASH, "Invalid ioctl cmd type");

		rc = -EINVAL;

		rc = -ENOIOCTLCMD;

		break;

	}
@@ -288,7 +291,8 @@ static long cam_flash_subdev_do_ioctl(struct v4l2_subdev *sd, 
	default:

		CAM_ERR(CAM_FLASH, "Invalid compat ioctl cmd_type:%d",

			cmd);

		rc = -EINVAL;

		rc = -ENOIOCTLCMD;

		break;

	}



	if (!rc) {

drivers/cam_sensor_module/cam_ois/cam_ois_dev.c

+6 −1
Original line number Diff line number Diff line
@@ -19,8 +19,12 @@ static long cam_ois_subdev_ioctl(struct v4l2_subdev *sd, 
	switch (cmd) {

	case VIDIOC_CAM_CONTROL:

		rc = cam_ois_driver_cmd(o_ctrl, arg);

		if (rc)

			CAM_ERR(CAM_OIS,

				"Failed with driver cmd: %d", rc);

		break;

	default:

		CAM_ERR(CAM_OIS, "Wrong IOCTL cmd: %u", cmd);

		rc = -ENOIOCTLCMD;

		break;

	}
@@ -95,7 +99,8 @@ static long cam_ois_init_subdev_do_ioctl(struct v4l2_subdev *sd, 
		break;

	default:

		CAM_ERR(CAM_OIS, "Invalid compat ioctl: %d", cmd);

		rc = -EINVAL;

		rc = -ENOIOCTLCMD;

		break;

	}



	if (!rc) {