Commit 5017e1b1 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mauro Carvalho Chehab

[media] v4l: vsp1: Fix wrong entities links creation

The Media Control framework now requires entities to be registered with
the media device before creating links so commit c7621b30 ("[media]
v4l: vsp1: separate links creation from entities init") separated link
creation from entities init.

But unfortunately that patch introduced a regression since wrong links
were created causing a boot failure on Renesas boards.

This patch fixes the boot issue and also the media graph was compared
by Geert Uytterhoeven to make sure that the driver changes required by
the Media Control framework next generation did not affect the graph.
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 92e963f5
...@@ -256,7 +256,7 @@ static int vsp1_create_entities(struct vsp1_device *vsp1) ...@@ -256,7 +256,7 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
/* Create links. */ /* Create links. */
list_for_each_entry(entity, &vsp1->entities, list_dev) { list_for_each_entry(entity, &vsp1->entities, list_dev) {
if (entity->type == VSP1_ENTITY_LIF) { if (entity->type == VSP1_ENTITY_WPF) {
ret = vsp1_wpf_create_links(vsp1, entity); ret = vsp1_wpf_create_links(vsp1, entity);
if (ret < 0) if (ret < 0)
goto done; goto done;
...@@ -264,7 +264,10 @@ static int vsp1_create_entities(struct vsp1_device *vsp1) ...@@ -264,7 +264,10 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
ret = vsp1_rpf_create_links(vsp1, entity); ret = vsp1_rpf_create_links(vsp1, entity);
if (ret < 0) if (ret < 0)
goto done; goto done;
} else { }
if (entity->type != VSP1_ENTITY_LIF &&
entity->type != VSP1_ENTITY_RPF) {
ret = vsp1_create_links(vsp1, entity); ret = vsp1_create_links(vsp1, entity);
if (ret < 0) if (ret < 0)
goto done; goto done;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment