A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: cci: Fix cam_cci_get_subdev for conditional compilation" into camera-kernel.lnx.1.0

Browse source
This commit is contained in:
Camera Software Integration 2019-11-12 05:43:21 -08:00 • committed by Gerrit - the friendly Code Review server
commit 59f2100a95
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/cam_sensor_module/cam_cci/cam_cci_dev.c
View file

@ -14,9 +14,16 @@ static struct v4l2_subdev *g_cci_subdev[MAX_CCI];
struct v4l2_subdev *cam_cci_get_subdev(int cci_dev_index)
{
struct v4l2_subdev *sub_device = NULL;
if (cci_dev_index < MAX_CCI)
return g_cci_subdev[cci_dev_index];
return NULL;
sub_device = g_cci_subdev[cci_dev_index];
else
CAM_WARN(CAM_CCI, "Index: %u is beyond max num CCI allowed: %u",
cci_dev_index,
MAX_CCI);
return sub_device;
}
static long cam_cci_subdev_ioctl(struct v4l2_subdev *sd,

9
drivers/cam_sensor_module/cam_cci/cam_cci_dev.h
View file

@ -295,14 +295,7 @@ struct cci_write_async {
irqreturn_t cam_cci_irq(int irq_num, void *data);
#ifdef CONFIG_SPECTRA_CAMERA
extern struct v4l2_subdev *cam_cci_get_subdev(int cci_dev_index);
#else
static inline struct v4l2_subdev *cam_cci_get_subdev(int cci_dev_index)
{
return NULL;
}
#endif
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 *)