A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Camera Software Integration 2020-09-14 12:44:39 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2638d4f39a
6 changed files with 39 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/cam_sensor_module/cam_actuator/cam_actuator_dev.c
View file

@ -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;
@ -54,10 +57,11 @@ static long cam_actuator_init_subdev_do_ioctl(struct v4l2_subdev *sd,
rc);
return rc;
}
break;
break;
default:
CAM_ERR(CAM_ACTUATOR, "Invalid compat ioctl: %d", cmd);
rc = -EINVAL;
rc = -ENOIOCTLCMD;
break;
}
if (!rc) {

14
drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.c
View file

@ -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) {

3
drivers/cam_sensor_module/cam_eeprom/cam_eeprom_dev.c
View file

@ -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;

8
drivers/cam_sensor_module/cam_flash/cam_flash_dev.c
View file

@ -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) {

7
drivers/cam_sensor_module/cam_ois/cam_ois_dev.c
View file

@ -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) {

10
drivers/cam_sensor_module/cam_sensor/cam_sensor_dev.c
View file

@ -19,10 +19,13 @@ static long cam_sensor_subdev_ioctl(struct v4l2_subdev *sd,
switch (cmd) {
case VIDIOC_CAM_CONTROL:
rc = cam_sensor_driver_cmd(s_ctrl, arg);
if (rc)
CAM_ERR(CAM_SENSOR,
"Failed in Driver cmd: %d", rc);
break;
default:
CAM_ERR(CAM_SENSOR, "Invalid ioctl cmd: %d", cmd);
rc = -EINVAL;
rc = -ENOIOCTLCMD;
break;
}
return rc;
@ -65,10 +68,11 @@ static long cam_sensor_init_subdev_do_ioctl(struct v4l2_subdev *sd,
rc = cam_sensor_subdev_ioctl(sd, cmd, &cmd_data);
if (rc < 0)
CAM_ERR(CAM_SENSOR, "cam_sensor_subdev_ioctl failed");
break;
break;
default:
CAM_ERR(CAM_SENSOR, "Invalid compat ioctl cmd_type: %d", cmd);
rc = -EINVAL;
rc = -ENOIOCTLCMD;
break;
}
if (!rc) {