Merge "msm: camera: cci: Fix incorrect use of cci config ioctl" into camera-kernel.lnx.4.0

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));
 	new_cci_dev->v4l2_dev_str.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 =
 		CAM_CCI_DEVICE_TYPE;
 	new_cci_dev->v4l2_dev_str.token =

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);
 #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_ */