Merge tag 'media/v4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[deliverable/linux.git] / drivers / media / v4l2-core / v4l2-flash-led-class.c

diff --git a/drivers/media/v4l2-core/v4l2-flash-led-class.c b/drivers/media/v4l2-core/v4l2-flash-led-class.c
index 5d673357f75f1ede5af69095d6f273bbc4a01ca7..fc5ff8b215f9ad8a216eb25e33faa6843f439dfb 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-flash-led-class.c
+++ b/drivers/media/v4l2-core/v4l2-flash-led-class.c
@@ -651,11 +651,11 @@ struct v4l2_flash *v4l2_flash_init(
        sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
        strlcpy(sd->name, config->dev_name, sizeof(sd->name));
 
-       ret = media_entity_init(&sd->entity, 0, NULL, 0);
+       ret = media_entity_pads_init(&sd->entity, 0, NULL);
        if (ret < 0)
                return ERR_PTR(ret);
 
-       sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_FLASH;
+       sd->entity.function = MEDIA_ENT_F_FLASH;
 
        ret = v4l2_flash_init_controls(v4l2_flash, config);
        if (ret < 0)