Commit 6008dea1 authored by Yunke Cao's avatar Yunke Cao Committed by Mauro Carvalho Chehab
Browse files

media: entity: skip non-data link when removing reverse links



The original implementation removes reverse links for any input link and
assumes the presense of sink/source.
It fails when the link is a not a data link.
media_entity_remove_links when there's an ancillary link can also fail.

We only need to remove reverse links for a data link.

Signed-off-by: default avatarYunke Cao <yunkec@google.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent d8fdfc66
Loading
Loading
Loading
Loading
+19 −15
Original line number Diff line number Diff line
@@ -579,6 +579,8 @@ static void __media_entity_remove_link(struct media_entity *entity,
	struct media_link *rlink, *tmp;
	struct media_entity *remote;

	/* Remove the reverse links for a data link. */
	if ((link->flags & MEDIA_LNK_FL_LINK_TYPE) == MEDIA_LNK_FL_DATA_LINK) {
		if (link->source->entity == entity)
			remote = link->sink->entity;
		else
@@ -599,6 +601,8 @@ static void __media_entity_remove_link(struct media_entity *entity,
			if (--remote->num_links == 0)
				break;
		}
	}

	list_del(&link->list);
	media_gobj_destroy(&link->graph_obj);
	kfree(link);