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

Commit 7213fe7e authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: vsp1: create pad links after subdev registration 



The vsp1 driver creates the pads links before the media entities are
registered with the media device. This doesn't work now that object
IDs are used to create links so the media_device has to be set.

Move entities registration logic before pads links creation.

Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 5837ceea

drivers/media/platform/vsp1/vsp1_drv.c

+8 −8
Original line number Diff line number Diff line
@@ -250,6 +250,14 @@ static int vsp1_create_entities(struct vsp1_device *vsp1) 
		list_add_tail(&wpf->entity.list_dev, &vsp1->entities);

	}



	/* Register all subdevs. */

	list_for_each_entry(entity, &vsp1->entities, list_dev) {

		ret = v4l2_device_register_subdev(&vsp1->v4l2_dev,

						  &entity->subdev);

		if (ret < 0)

			goto done;

	}



	/* Create links. */

	list_for_each_entry(entity, &vsp1->entities, list_dev) {

		if (entity->type == VSP1_ENTITY_LIF ||
@@ -269,14 +277,6 @@ static int vsp1_create_entities(struct vsp1_device *vsp1) 
			return ret;

	}



	/* Register all subdevs. */

	list_for_each_entry(entity, &vsp1->entities, list_dev) {

		ret = v4l2_device_register_subdev(&vsp1->v4l2_dev,

						  &entity->subdev);

		if (ret < 0)

			goto done;

	}



	ret = v4l2_device_register_subdev_nodes(&vsp1->v4l2_dev);



done: