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 <fpacheco@codeaurora.org>
This commit is contained in:
1 parent
f76c2819d6
commit
76d1c90e23
2 files changed
+3
-4
No files matched your search
@@ -1,6 +1,6 @@
|
||||
// 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.
|
||||
*/
|
||||
|
||||
#include "cam_cci_dev.h"
|
||||
@@ -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 =
|
||||
|
||||
@@ -304,6 +304,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_ */
|
||||
Reference in new issue
Block a user