Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index 3c3c4bf..ff57c1d 100644 (file)
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -1213,8 +1213,8 @@ static int adv7180_probe(struct i2c_client *client,
                goto err_unregister_vpp_client;
 
        state->pad.flags = MEDIA_PAD_FL_SOURCE;
-       sd->entity.flags |= MEDIA_ENT_T_V4L2_SUBDEV_DECODER;
-       ret = media_entity_init(&sd->entity, 1, &state->pad, 0);
+       sd->entity.flags |= MEDIA_ENT_F_ATV_DECODER;
+       ret = media_entity_pads_init(&sd->entity, 1, &state->pad);
        if (ret)
                goto err_free_ctrl;