Commit ed2fb2f5 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Mauro Carvalho Chehab
Browse files

media: vicodec: Do not zero reserved fields 



Core code already clears reserved fields of struct
v4l2_pix_format_mplane, check commit 4e1e0eb0 ("media: v4l2-ioctl: Zero
v4l2_plane_pix_format reserved fields").

Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent b7d2c99a

drivers/media/test-drivers/vicodec/vicodec-core.c

+0 −5
Original line number Diff line number Diff line
@@ -811,9 +811,6 @@ static int vidioc_g_fmt(struct vicodec_ctx *ctx, struct v4l2_format *f) 
		pix_mp->xfer_func = ctx->state.xfer_func;

		pix_mp->ycbcr_enc = ctx->state.ycbcr_enc;

		pix_mp->quantization = ctx->state.quantization;

		memset(pix_mp->reserved, 0, sizeof(pix_mp->reserved));

		memset(pix_mp->plane_fmt[0].reserved, 0,

		       sizeof(pix_mp->plane_fmt[0].reserved));

		break;

	default:

		return -EINVAL;
@@ -886,8 +883,6 @@ static int vidioc_try_fmt(struct vicodec_ctx *ctx, struct v4l2_format *f) 
			info->sizeimage_mult / info->sizeimage_div;

		if (pix_mp->pixelformat == V4L2_PIX_FMT_FWHT)

			plane->sizeimage += sizeof(struct fwht_cframe_hdr);

		memset(pix_mp->reserved, 0, sizeof(pix_mp->reserved));

		memset(plane->reserved, 0, sizeof(plane->reserved));

		break;

	default:

		return -EINVAL;