]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
media: imagination: e5010: Drop unneeded v4l2_m2m_get_vq() NULL check
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Wed, 15 Oct 2025 07:53:29 +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.

In e5010_s_fmt(), 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.

In e5010_s_selection(), the function performs an explicit type check, so
the NULL check couldn't have been intended as a type check.

Drop the unneeded return value check.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
drivers/media/platform/imagination/e5010-jpeg-enc.c

index c4e0097cb8b7fa310c2c5519d7af4e6e3b378915..1b5c8b1d6a319277fbdc6f0e6aa4e923384fe2a9 100644 (file)
@@ -396,8 +396,6 @@ static int e5010_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
        struct e5010_fmt *fmt;
 
        vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
-       if (!vq)
-               return -EINVAL;
 
        if (vb2_is_busy(vq)) {
                v4l2_err(&ctx->e5010->v4l2_dev, "queue busy\n");
@@ -496,8 +494,6 @@ static int e5010_s_selection(struct file *file, void *fh, struct v4l2_selection
        struct v4l2_rect base_rect;
 
        vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, s->type);
-       if (!vq)
-               return -EINVAL;
 
        if (vb2_is_streaming(vq))
                return -EBUSY;