diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2021-02-07 18:24:09 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2021-02-07 18:24:09 -0800 |
| commit | 60b94308066188813f27f7c0d20ea8442793ef03 (patch) | |
| tree | 1f96415fc84770b961c6bc0881df865e49feb252 | |
| parent | 26e691511b509dfad9cefd4300fdc8e6a7e576b1 (diff) | |
| parent | a1472c276d4d58cfa1f8eba04e37e49f295fccd0 (diff) | |
| download | camera-kernel-60b94308066188813f27f7c0d20ea8442793ef03.tar.gz | |
Merge android-msm-pixel-4.19-rvc-qpr3 into android-msm-pixel-4.19android-s-v2-beta-2_r0.4android-s-v2-beta-1_r0.4android-s-preview-3_r0.5android-s-preview-2_r0.5android-s-beta-5_r0.5android-s-beta-4_r0.5android-s-beta-3_r0.5android-s-beta-2_r0.5android-s-beta-1_r0.5android-12.0.0_r0.6android-12.0.0_r0.40android-12.0.0_r0.34android-12.0.0_r0.24android-12.0.0_r0.14android-msm-redbull-4.19-s-preview-3android-msm-redbull-4.19-s-preview-2android-msm-redbull-4.19-s-beta-5android-msm-redbull-4.19-s-beta-4android-msm-redbull-4.19-s-beta-3android-msm-redbull-4.19-s-beta-2android-msm-redbull-4.19-s-beta-1android-msm-redbull-4.19-android12-v2-beta-2android-msm-redbull-4.19-android12-qpr1android-msm-redbull-4.19-android12android-msm-redbull--s-v2-beta-1
SBMerger: 351186807
Change-Id: Icdc986ff6ab7633405f459c99b017539d3722e3b
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | drivers/cam_sensor_module/cam_cci/cam_cci_dev.c | 5 | ||||
| -rw-r--r-- | drivers/cam_sensor_module/cam_cci/cam_cci_dev.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c index 78da5e9..2f773ef 100644 --- a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c +++ b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c @@ -431,8 +431,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 = @@ -524,6 +523,8 @@ static int cam_cci_assign_fops(void) sd = g_cci_subdev[i]; if (!sd) return 0; + if (!(sd->flags & V4L2_SUBDEV_FL_HAS_DEVNODE)) + continue; if (!(sd->devnode)) { CAM_ERR(CAM_CCI, "Invalid dev node:%pK offset: %d", diff --git a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.h b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.h index 3b89f93..25c8efe 100644 --- a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.h +++ b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.h @@ -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. */ #ifndef _CAM_CCI_DEV_H_ @@ -298,7 +298,7 @@ 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) #ifdef CONFIG_SPECTRA_CAMERA_MODULE extern int cam_cci_late_init(void); |