| From d171c45da874e3858a83e6377e00280a507fe2f2 Mon Sep 17 00:00:00 2001 |
| From: Ezequiel Garcia <ezequiel@collabora.com> |
| Date: Tue, 4 Feb 2020 20:38:37 +0100 |
| Subject: media: hantro: Fix broken media controller links |
| |
| From: Ezequiel Garcia <ezequiel@collabora.com> |
| |
| commit d171c45da874e3858a83e6377e00280a507fe2f2 upstream. |
| |
| The driver currently creates a broken topology, |
| with a source-to-source link and a sink-to-sink |
| link instead of two source-to-sink links. |
| |
| Reported-by: Nicolas Dufresne <nicolas@ndufresne.ca> |
| Cc: <stable@vger.kernel.org> # for v5.3 and up |
| Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> |
| Tested-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/staging/media/hantro/hantro_drv.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/staging/media/hantro/hantro_drv.c |
| +++ b/drivers/staging/media/hantro/hantro_drv.c |
| @@ -553,13 +553,13 @@ static int hantro_attach_func(struct han |
| goto err_rel_entity1; |
| |
| /* Connect the three entities */ |
| - ret = media_create_pad_link(&func->vdev.entity, 0, &func->proc, 1, |
| + ret = media_create_pad_link(&func->vdev.entity, 0, &func->proc, 0, |
| MEDIA_LNK_FL_IMMUTABLE | |
| MEDIA_LNK_FL_ENABLED); |
| if (ret) |
| goto err_rel_entity2; |
| |
| - ret = media_create_pad_link(&func->proc, 0, &func->sink, 0, |
| + ret = media_create_pad_link(&func->proc, 1, &func->sink, 0, |
| MEDIA_LNK_FL_IMMUTABLE | |
| MEDIA_LNK_FL_ENABLED); |
| if (ret) |
