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

Commit 0e69194c authored by Fernando Pacheco's avatar Fernando Pacheco Committed by Sridhar Gujje
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>
parent 03528467

drivers/cam_sensor_module/cam_cci/cam_cci_dev.c

+1 −2
Original line number Diff line number Diff line
@@ -429,8 +429,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/cam_sensor_module/cam_cci/cam_cci_dev.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

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

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

 */



#ifndef _CAM_CCI_DEV_H_
@@ -298,6 +298,6 @@ irqreturn_t cam_cci_irq(int irq_num, void *data); 
struct v4l2_subdev *cam_cci_get_subdev(int cci_dev_index);



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