Merge "msm: driver: Camerav2: driver support for msm8909" (67efdd56) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -1185,11 +1185,6 @@ static void msm_cci_init_clk_params(struct cci_device *cci_dev)
		return;
		}

		struct v4l2_subdev *msm_cci_get_subdev(void)
		{
		return g_cci_subdev;
		}

		static int msm_cci_get_clk_info(struct cci_device *cci_dev,
		struct platform_device *pdev)
		{

+11 −1

Original line number	Diff line number	Diff line
		@@ -182,7 +182,17 @@ enum msm_cci_gpio_cmd_type {
		CCI_GPIO_INVALID_CMD,
		};

		struct v4l2_subdev *msm_cci_get_subdev(void);
		#ifdef MSM_CCI
		static inline struct v4l2_subdev *msm_cci_get_subdev(void)
		{
		return g_cci_subdev;
		}
		#else
		static inline struct v4l2_subdev *msm_cci_get_subdev(void)
		{
		return NULL;
		}
		#endif

		#define VIDIOC_MSM_CCI_CFG \
		_IOWR('V', BASE_VIDIOC_PRIVATE + 23, struct msm_camera_cci_ctrl *)