Merge branch 'android-msm-pixel-4.19-rvc-security' into android-msm-pixel-4.19-rvc-qpr2
Apr 2021.1
Bug: 178362004
Change-Id: I8e1e3daf0603e01437a4f784dabbd8afe1ae40dc
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 @@
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 @@
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 @@
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);
