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

Commit 7a6f0b22 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] media: Properly handle link flags in link setup, link notify callback 



The link flags were not properly handled in __media_entity_setup_link
which could lead to link_notify callback to be called when the flags are
not modified. Fix this.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2d4e9d1d

drivers/media/media-entity.c

+6 −2
Original line number Diff line number Diff line
@@ -378,7 +378,6 @@ EXPORT_SYMBOL_GPL(media_entity_create_link); 


static int __media_entity_setup_link_notify(struct media_link *link, u32 flags)

{

	const u32 mask = MEDIA_LNK_FL_ENABLED;

	int ret;



	/* Notify both entities. */
@@ -395,7 +394,7 @@ static int __media_entity_setup_link_notify(struct media_link *link, u32 flags) 
		return ret;

	}



	link->flags = (link->flags & ~mask) | (flags & mask);

	link->flags = flags;

	link->reverse->flags = link->flags;



	return 0;
@@ -417,6 +416,7 @@ static int __media_entity_setup_link_notify(struct media_link *link, u32 flags) 
 */

int __media_entity_setup_link(struct media_link *link, u32 flags)

{

	const u32 mask = MEDIA_LNK_FL_ENABLED;

	struct media_device *mdev;

	struct media_entity *source, *sink;

	int ret = -EBUSY;
@@ -424,6 +424,10 @@ int __media_entity_setup_link(struct media_link *link, u32 flags) 
	if (link == NULL)

		return -EINVAL;



	/* The non-modifiable link flags must not be modified. */

	if ((link->flags & ~mask) != (flags & ~mask))

		return -EINVAL;



	if (link->flags & MEDIA_LNK_FL_IMMUTABLE)

		return link->flags == flags ? 0 : -EINVAL;