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

Commit f418a9d0 authored by Biju Das's avatar Biju Das Committed by Greg Kroah-Hartman
Browse files

media: v4l: vsp1: Fix uif null pointer access 



commit 6732f313938027a910e1f7351951ff52c0329e70 upstream.

RZ/G2L SoC has no UIF. This patch fixes null pointer access, when UIF
module is not used.

Fixes: 5e824f98("media: v4l: vsp1: Integrate DISCOM in display pipeline")
Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8ebbf254

drivers/media/platform/vsp1/vsp1_drm.c

+2 −2
Original line number Diff line number Diff line
@@ -460,9 +460,9 @@ static int vsp1_du_pipeline_setup_inputs(struct vsp1_device *vsp1, 
	 * make sure it is present in the pipeline's list of entities if it

	 * wasn't already.

	 */

	if (!use_uif) {

	if (drm_pipe->uif && !use_uif) {

		drm_pipe->uif->pipe = NULL;

	} else if (!drm_pipe->uif->pipe) {

	} else if (drm_pipe->uif && !drm_pipe->uif->pipe) {

		drm_pipe->uif->pipe = pipe;

		list_add_tail(&drm_pipe->uif->list_pipe, &pipe->entities);

	}