Selaa lähdekoodia

msm: camera: cci: Fix incorrect use of cci config ioctl

The cci configuration will be transitioned to a new API that does not
require routing through the v4l layer. This is work-in-progrss so in
the mean time prevent the device from being exposed as configurable
from userspace.

The ioctl will still be exposed to kernel users so fix the arg size
as well. We want size of struct not pointer.

CRs-Fixed: 2702760
Change-Id: I9c7bd8f76980603dbf27e1c5bc9b19f8a3b8a39a
Signed-off-by: Fernando Pacheco <[email protected]>
Fernando Pacheco 5 vuotta sitten
vanhempi
sitoutus
aaf3059502

+ 1 - 2
drivers/cam_sensor_module/cam_cci/cam_cci_dev.c

@@ -409,8 +409,7 @@ static int cam_cci_component_bind(struct device *dev,
 		sizeof(new_cci_dev->device_name));
 		sizeof(new_cci_dev->device_name));
 	new_cci_dev->v4l2_dev_str.name =
 	new_cci_dev->v4l2_dev_str.name =
 		new_cci_dev->device_name;
 		new_cci_dev->device_name;
-	new_cci_dev->v4l2_dev_str.sd_flags =
-		(V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS);
+	new_cci_dev->v4l2_dev_str.sd_flags = V4L2_SUBDEV_FL_HAS_EVENTS;
 	new_cci_dev->v4l2_dev_str.ent_function =
 	new_cci_dev->v4l2_dev_str.ent_function =
 		CAM_CCI_DEVICE_TYPE;
 		CAM_CCI_DEVICE_TYPE;
 	new_cci_dev->v4l2_dev_str.token =
 	new_cci_dev->v4l2_dev_str.token =

+ 1 - 1
drivers/cam_sensor_module/cam_cci/cam_cci_dev.h

@@ -313,6 +313,6 @@ int cam_cci_init_module(void);
  */
  */
 void cam_cci_exit_module(void);
 void cam_cci_exit_module(void);
 #define VIDIOC_MSM_CCI_CFG \
 #define VIDIOC_MSM_CCI_CFG \
-	_IOWR('V', BASE_VIDIOC_PRIVATE + 23, struct cam_cci_ctrl *)
+	_IOWR('V', BASE_VIDIOC_PRIVATE + 23, struct cam_cci_ctrl)
 
 
 #endif /* _CAM_CCI_DEV_H_ */
 #endif /* _CAM_CCI_DEV_H_ */