]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: vsp1: Fix smatch warning
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Thu, 7 Feb 2019 09:13:36 +0000 (04:13 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Mon, 18 Feb 2019 20:21:17 +0000 (15:21 -0500)
drivers/media/platform/vsp1/vsp1_drm.c: drivers/media/platform/vsp1/vsp1_drm.c:336 vsp1_du_pipeline_setup_brx() error: we previously assumed 'pipe->brx' could be null (see line 244)

smatch missed that if pipe->brx was NULL, then later on it will be
set with a non-NULL value. But it is easier to just use the brx pointer
so smatch doesn't get confused.

Tested-on: Salvator-XS-ES2.0, Salvator-XS-M3N

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Tested-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/vsp1/vsp1_drm.c

index 8d86f618ec776bb893c6b298e1d232b0cca076af..84895385d2e5ef3e035e77721575dc267b3a4187 100644 (file)
@@ -333,19 +333,19 @@ static int vsp1_du_pipeline_setup_brx(struct vsp1_device *vsp1,
         * on the BRx sink pad 0 and propagated inside the entity, not on the
         * source pad.
         */
-       format.pad = pipe->brx->source_pad;
+       format.pad = brx->source_pad;
        format.format.width = drm_pipe->width;
        format.format.height = drm_pipe->height;
        format.format.field = V4L2_FIELD_NONE;
 
-       ret = v4l2_subdev_call(&pipe->brx->subdev, pad, set_fmt, NULL,
+       ret = v4l2_subdev_call(&brx->subdev, pad, set_fmt, NULL,
                               &format);
        if (ret < 0)
                return ret;
 
        dev_dbg(vsp1->dev, "%s: set format %ux%u (%x) on %s pad %u\n",
                __func__, format.format.width, format.format.height,
-               format.format.code, BRX_NAME(pipe->brx), pipe->brx->source_pad);
+               format.format.code, BRX_NAME(brx), brx->source_pad);
 
        if (format.format.width != drm_pipe->width ||
            format.format.height != drm_pipe->height) {