mirror of
https://github.com/torvalds/linux.git
synced 2026-05-29 17:43:52 +02:00
media: uvcvideo: Drop unneeded memset() in meta device ioctl handlers
The .vidioc_g_fmt_meta_cap() and .vidioc_enum_fmt_meta_cap() ioctl handlers for meta capture devices memset the ioctl argument structure to zero. This is unnecessary as the memory is already zeroed by the V4L2 ioctl core. Drop the memset(), which, in uvc_meta_v4l2_enum_formats(), also allows further simplification as structure fields don't need to be saved and restored. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Ricardo Ribalda <ribalda@chromium.org> Reviewed-by: Hans de Goede <hansg@kernel.org> Signed-off-by: Hans de Goede <hansg@kernel.org> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
parent
e8e65d9237
commit
1dcfbdb361
|
|
@ -49,8 +49,6 @@ static int uvc_meta_v4l2_get_format(struct file *file, void *priv,
|
|||
if (format->type != vfh->vdev->queue->type)
|
||||
return -EINVAL;
|
||||
|
||||
memset(fmt, 0, sizeof(*fmt));
|
||||
|
||||
fmt->dataformat = stream->meta.format;
|
||||
fmt->buffersize = UVC_METADATA_BUF_SIZE;
|
||||
|
||||
|
|
@ -118,19 +116,14 @@ static int uvc_meta_v4l2_enum_formats(struct file *file, void *priv,
|
|||
struct v4l2_fh *vfh = file_to_v4l2_fh(file);
|
||||
struct uvc_streaming *stream = video_get_drvdata(vfh->vdev);
|
||||
struct uvc_device *dev = stream->dev;
|
||||
u32 i = fdesc->index;
|
||||
|
||||
if (fdesc->type != vfh->vdev->queue->type)
|
||||
return -EINVAL;
|
||||
|
||||
if (i >= dev->nmeta_formats)
|
||||
if (fdesc->index >= dev->nmeta_formats)
|
||||
return -EINVAL;
|
||||
|
||||
memset(fdesc, 0, sizeof(*fdesc));
|
||||
|
||||
fdesc->type = vfh->vdev->queue->type;
|
||||
fdesc->index = i;
|
||||
fdesc->pixelformat = dev->meta_formats[i];
|
||||
fdesc->pixelformat = dev->meta_formats[fdesc->index];
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user