diff options
| author | Will McVicker <willmcvicker@google.com> | 2021-01-29 17:25:59 +0800 |
|---|---|---|
| committer | Will McVicker <willmcvicker@google.com> | 2021-01-29 11:34:46 -0800 |
| commit | 715dae627cee26ad285b41303092f6e2019c3c87 (patch) | |
| tree | 1d6cb29ab8d9c7801aa4c1839c2f98c2bb243d78 | |
| parent | 372cc88936c0872466414999a4b17e67ee154914 (diff) | |
| download | camera-kernel-715dae627cee26ad285b41303092f6e2019c3c87.tar.gz | |
GKI: msm: camera: cci: verify subdev has a devnode before assignment
This checks the subdev's flags to verify it has a devnode before
attempting to assign the fops. If there is no devnode, then the
assignment fails which leads to a module init failure and ultimately
preventing the device from booting.
Test: boot redfin, verify basic camera functionality
Bug: 167966902
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I17f9823de81e867f5c4bf053e539406115733f1e
Signed-off-by: timothywang <timothywang@google.com>
| -rw-r--r-- | drivers/cam_sensor_module/cam_cci/cam_cci_dev.c | 2 |
1 files changed, 2 insertions, 0 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 4f019dd..2f773ef 100644 --- a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c +++ b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c @@ -523,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", |