Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed57256f authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] tm6000: fix G/TRY_FMT 



Two fixes:
- the priv field wasn't set to 0.
- only V4L2_FIELD_INTERLACED is supported.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 52dec548

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

+3 −6
Original line number Diff line number Diff line
@@ -918,6 +918,7 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, 
		(f->fmt.pix.width * fh->fmt->depth) >> 3;

	f->fmt.pix.sizeimage =

		f->fmt.pix.height * f->fmt.pix.bytesperline;

	f->fmt.pix.priv = 0;



	return 0;

}
@@ -948,12 +949,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, 


	field = f->fmt.pix.field;



	if (field == V4L2_FIELD_ANY)

		field = V4L2_FIELD_SEQ_TB;

	else if (V4L2_FIELD_INTERLACED != field) {

		dprintk(dev, V4L2_DEBUG_IOCTL_ARG, "Field type invalid.\n");

		return -EINVAL;

	}

	field = V4L2_FIELD_INTERLACED;



	tm6000_get_std_res(dev);
@@ -963,6 +959,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, 
	f->fmt.pix.width &= ~0x01;



	f->fmt.pix.field = field;

	f->fmt.pix.priv = 0;



	f->fmt.pix.bytesperline =

		(f->fmt.pix.width * fmt->depth) >> 3;