diff options
| author | Biju Das <biju.das.jz@bp.renesas.com> | 2021-03-01 13:08:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-17 17:06:20 +0100 |
| commit | db2ae26d785522701ce1f08262dbdf17100d13a3 (patch) | |
| tree | 902e0e278c2657adee0892be32505536c8a80686 /drivers/media/platform | |
| parent | 465fd4191aaafdc678ced6d866e7047d6d0caa38 (diff) | |
| download | kernel_replicant_linux-db2ae26d785522701ce1f08262dbdf17100d13a3.tar.gz kernel_replicant_linux-db2ae26d785522701ce1f08262dbdf17100d13a3.tar.bz2 kernel_replicant_linux-db2ae26d785522701ce1f08262dbdf17100d13a3.zip | |
media: v4l: vsp1: Fix bru null pointer access
commit ac8d82f586c8692b501cb974604a71ef0e22a04c upstream.
RZ/G2L SoC has only BRS. This patch fixes null pointer access,when only
BRS is enabled.
Fixes: cbb7fa49c7466("media: v4l: vsp1: Rename BRU to BRx")
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.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>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/vsp1/vsp1_drm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c index b5e75cd3f8f5..06f74d410973 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -245,7 +245,7 @@ static int vsp1_du_pipeline_setup_brx(struct vsp1_device *vsp1, brx = &vsp1->bru->entity; else if (pipe->brx && !drm_pipe->force_brx_release) brx = pipe->brx; - else if (!vsp1->bru->entity.pipe) + else if (vsp1_feature(vsp1, VSP1_HAS_BRU) && !vsp1->bru->entity.pipe) brx = &vsp1->bru->entity; else brx = &vsp1->brs->entity; |