From 8a57478d1cbfd922c7a0626d9390d01ec2cbe25c Mon Sep 17 00:00:00 2001 From: Hu Kejun Date: Thu, 13 Jun 2019 16:14:49 +0800 Subject: [PATCH] media: i2c: ov13850: fix compile error on kernel-4.19 Change-Id: Ia098d904835d07780a6abc9cbdddbaa4a9d1a20d Signed-off-by: Hu Kejun --- drivers/media/i2c/Kconfig | 9 +++++++++ drivers/media/i2c/Makefile | 1 + drivers/media/i2c/ov13850.c | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 82af97430e5b..38b163995006 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -790,6 +790,15 @@ config VIDEO_OV9650 This is a V4L2 sensor driver for the Omnivision OV9650 and OV9652 camera sensors. +config VIDEO_OV13850 + tristate "OmniVision OV13850 sensor support" + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on MEDIA_CAMERA_SUPPORT + select V4L2_FWNODE + ---help--- + This is a Video4Linux2 sensor driver for the OmniVision + OV13850 camera. + config VIDEO_OV13858 tristate "OmniVision OV13858 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile index a94eb03d10d4..13367758a1de 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -79,6 +79,7 @@ obj-$(CONFIG_VIDEO_OV7670) += ov7670.o obj-$(CONFIG_VIDEO_OV772X) += ov772x.o obj-$(CONFIG_VIDEO_OV7740) += ov7740.o obj-$(CONFIG_VIDEO_OV9650) += ov9650.o +obj-$(CONFIG_VIDEO_OV13850) += ov13850.o obj-$(CONFIG_VIDEO_OV13858) += ov13858.o obj-$(CONFIG_VIDEO_MT9M032) += mt9m032.o obj-$(CONFIG_VIDEO_MT9M111) += mt9m111.o diff --git a/drivers/media/i2c/ov13850.c b/drivers/media/i2c/ov13850.c index 56b50d48dfc7..6ad238704f41 100644 --- a/drivers/media/i2c/ov13850.c +++ b/drivers/media/i2c/ov13850.c @@ -1352,8 +1352,8 @@ static int ov13850_probe(struct i2c_client *client, #endif #if defined(CONFIG_MEDIA_CONTROLLER) ov13850->pad.flags = MEDIA_PAD_FL_SOURCE; - sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR; - ret = media_entity_init(&sd->entity, 1, &ov13850->pad, 0); + sd->entity.function = MEDIA_ENT_F_CAM_SENSOR; + ret = media_entity_pads_init(&sd->entity, 1, &ov13850->pad); if (ret < 0) goto err_power_off; #endif