]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
media: imx-jpeg: Drop unneeded v4l2_m2m_get_vq() NULL check
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Wed, 15 Oct 2025 07:53:34 +0000 (10:53 +0300)
committerHans Verkuil <hverkuil+cisco@kernel.org>
Fri, 17 Oct 2025 09:31:14 +0000 (11:31 +0200)
The v4l2_m2m_get_vq() function never returns NULL. The check may have
been intended to catch invalid format types, but that's not needed as
the V4L2 core picks the appropriate VIDIOC_S_FMT ioctl handler based on
the format type, so the type can't be incorrect. Drop the unneeded
return value check.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c

index df3ccdf767baf0bf6687808e2c017063181a7220..d41fa4c3139b62a41cbb0f8187b303e0fe58f42a 100644 (file)
@@ -2491,8 +2491,6 @@ static int mxc_jpeg_s_fmt(struct mxc_jpeg_ctx *ctx,
        struct mxc_jpeg_dev *jpeg = ctx->mxc_jpeg;
 
        vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
-       if (!vq)
-               return -EINVAL;
 
        if (vb2_is_busy(vq)) {
                v4l2_err(&jpeg->v4l2_dev, "queue busy\n");
@@ -2528,8 +2526,6 @@ static int mxc_jpeg_s_fmt_vid_out(struct file *file, void *priv,
                return 0;
 
        dst_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, cap_type);
-       if (!dst_vq)
-               return -EINVAL;
 
        if (vb2_is_busy(dst_vq))
                return 0;