Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d73840ed authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: driver: Camerav2: Fix read subdev id from cci device"

parents 78b1d03f e4b460a2

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

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

	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,

static int msm_cci_get_clk_info(struct cci_device *cci_dev,

	struct platform_device *pdev)

	struct platform_device *pdev)

{

{

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

+2 −5
Original line number Original line Diff line number Diff line
@@ -182,11 +182,8 @@ enum msm_cci_gpio_cmd_type { 
	CCI_GPIO_INVALID_CMD,

	CCI_GPIO_INVALID_CMD,

};

};





#ifdef MSM_CCI

#ifdef CONFIG_MSM_CCI

static inline struct v4l2_subdev *msm_cci_get_subdev(void)

struct v4l2_subdev *msm_cci_get_subdev(void);

{

	return g_cci_subdev;

}

#else

#else

static inline struct v4l2_subdev *msm_cci_get_subdev(void)

static inline struct v4l2_subdev *msm_cci_get_subdev(void)

{

{