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

Commit f9b5d969 authored by VijayaKumar T M's avatar VijayaKumar T M Committed by shaohanlin
Browse files

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: default avatarFernando Pacheco <fpacheco@codeaurora.org>
Signed-off-by: default avatarVijayaKumar T M <vtmuni@codeaurora.org>
parent 8d021c8e

drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_dev.c

+2 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, 2020 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -329,8 +329,7 @@ static int cam_cci_platform_probe(struct platform_device *pdev) 
		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/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_dev.h

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -308,6 +308,6 @@ static inline struct v4l2_subdev *cam_cci_get_subdev(void) 
#endif



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

drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_cci/cam_cci_dev.c

+2 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -403,8 +403,7 @@ static int cam_cci_platform_probe(struct platform_device *pdev) 
		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/media/platform/msm/camera_v3/cam_sensor_module/cam_cci/cam_cci_dev.h

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -316,6 +316,6 @@ static inline struct v4l2_subdev *cam_cci_get_subdev(int cci_dev_index) 
#endif



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