Merge "msm: camera: cci: Fix cam_cci_get_subdev for conditional compilation"... (59f2100a) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/cam_sensor_module/cam_cci/cam_cci_dev.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -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,

+1 −8

Original line number	Diff line number	Diff line
		@@ -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 *)