Commit 044041cd authored Feb 04, 2020 by Hans Verkuil Committed by Mauro Carvalho Chehab Feb 24, 2020

media: mc-entity.c: use & to check pad flags, not ==



These are bits so to test if a pad is a sink you use & but not ==.

It looks like the only reason this hasn't caused problems before is that
media_get_pad_index() is currently only used with pads that do not set the
MEDIA_PAD_FL_MUST_CONNECT flag. So a pad really had only the SINK or SOURCE
flag set and nothing else.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: <stable@vger.kernel.org>      # for v5.3 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent 316e730f

drivers/media/mc/mc-entity.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -639,9 +639,9 @@ int media_get_pad_index(struct media_entity *entity, bool is_sink,
		return -EINVAL;

		for (i = 0; i < entity->num_pads; i++) {
		if (entity->pads[i].flags == MEDIA_PAD_FL_SINK)
		if (entity->pads[i].flags & MEDIA_PAD_FL_SINK)
		pad_is_sink = true;
		else if (entity->pads[i].flags == MEDIA_PAD_FL_SOURCE)
		else if (entity->pads[i].flags & MEDIA_PAD_FL_SOURCE)
		pad_is_sink = false;
		else
		continue; /* This is an error! */

Admin message