[media] cx231xx: zero priv field and use right width in try_fmt (8b735c13) · Commits · 戴 / test

The priv field of v4l2_pix_format must be zeroed. Also fix a bug in try_fmt where the current width was used instead of the width passed to try_fmt. Signed-off-by:

Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by:

Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/usb/cx231xx/cx231xx-video.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1005,6 +1005,7 @@ static int vidioc_g_fmt_vid_cap(struct file file, void priv,
		f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;

		f->fmt.pix.field = V4L2_FIELD_INTERLACED;
		f->fmt.pix.priv = 0;

		return 0;
		}
		@@ -1045,10 +1046,11 @@ static int vidioc_try_fmt_vid_cap(struct file file, void priv,
		f->fmt.pix.width = width;
		f->fmt.pix.height = height;
		f->fmt.pix.pixelformat = fmt->fourcc;
		f->fmt.pix.bytesperline = (dev->width * fmt->depth + 7) >> 3;
		f->fmt.pix.bytesperline = (width * fmt->depth + 7) >> 3;
		f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * height;
		f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
		f->fmt.pix.field = V4L2_FIELD_INTERLACED;
		f->fmt.pix.priv = 0;

		return 0;
		}

Admin message