Merge tag 'dmaengine-fix-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[cascardo/linux.git] / drivers / media / i2c / adp1653.c

diff --git a/drivers/media/i2c/adp1653.c b/drivers/media/i2c/adp1653.c
index f00745b..7e9cbf7 100644 (file)
--- a/drivers/media/i2c/adp1653.c
+++ b/drivers/media/i2c/adp1653.c
@@ -512,11 +512,11 @@ static int adp1653_probe(struct i2c_client *client,
        if (ret)
                goto free_and_quit;
 
-       ret = media_entity_init(&flash->subdev.entity, 0, NULL, 0);
+       ret = media_entity_pads_init(&flash->subdev.entity, 0, NULL);
        if (ret < 0)
                goto free_and_quit;
 
-       flash->subdev.entity.type = MEDIA_ENT_T_V4L2_SUBDEV_FLASH;
+       flash->subdev.entity.function = MEDIA_ENT_F_FLASH;
 
        return 0;