| From 044041cd5227ec9ccf969f4bf1cc08bffe13b9d3 Mon Sep 17 00:00:00 2001 |
| From: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Date: Tue, 4 Feb 2020 19:19:22 +0100 |
| Subject: media: mc-entity.c: use & to check pad flags, not == |
| |
| From: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| |
| commit 044041cd5227ec9ccf969f4bf1cc08bffe13b9d3 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/mc/mc-entity.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/media/mc/mc-entity.c |
| +++ b/drivers/media/mc/mc-entity.c |
| @@ -639,9 +639,9 @@ int media_get_pad_index(struct media_ent |
| 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! */ |
