diff options
| author | Javier Martinez Canillas | 2015-09-03 16:20:34 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2016-01-11 15:18:45 +0100 |
| commit | 7213fe7eec174fb2b958ecc3ce04a6f811c2d4da (patch) | |
| tree | 19f5cb64683b77c359a1662f7b74af10dddcc01c | |
| parent | [media] staging: omap4iss: separate links creation from entities init (diff) | |
| download | kernel-qcow2-linux-7213fe7eec174fb2b958ecc3ce04a6f811c2d4da.tar.gz kernel-qcow2-linux-7213fe7eec174fb2b958ecc3ce04a6f811c2d4da.tar.xz kernel-qcow2-linux-7213fe7eec174fb2b958ecc3ce04a6f811c2d4da.zip | |
[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: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | drivers/media/platform/vsp1/vsp1_drv.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c index 9cd94a76a9ed..2aa427d3ff39 100644 --- a/drivers/media/platform/vsp1/vsp1_drv.c +++ b/drivers/media/platform/vsp1/vsp1_drv.c @@ -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: |