Commit 13c72805 authored by Michael H. Schimek's avatar Michael H. Schimek Committed by Linus Torvalds
Browse files

[PATCH] V4L: Fixes Bttv raw format to fix VIDIOCSPICT ioctl 



Fixes Bttv raw format to fix VIDIOCSPICT ioctl.

Signed-off-by: default avatarMichael H. Schimek <mschimek@gmx.at>
Signed-off-by: default avatarNickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 943a4902

drivers/media/video/bttv-driver.c

+9 −0
Original line number Diff line number Diff line
@@ -2290,6 +2290,15 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, 
			retval = -EINVAL;

			goto fh_unlock_and_return;

		}

		if (fmt->flags & FORMAT_FLAGS_RAW) {

			/* VIDIOCMCAPTURE uses gbufsize, not RAW_BPL *

			   RAW_LINES * 2. F1 is stored at offset 0, F2

			   at buffer size / 2. */

			fh->width = RAW_BPL;

			fh->height = gbufsize / RAW_BPL;

			btv->init.width  = RAW_BPL;

			btv->init.height = gbufsize / RAW_BPL;

		}

		fh->ovfmt   = fmt;

		fh->fmt     = fmt;

		btv->init.ovfmt   = fmt;

drivers/media/video/video-buf.c

+1 −0
Original line number Diff line number Diff line
@@ -816,6 +816,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q, 
		if (NULL == q->read_buf)

			goto done;

		q->read_buf->memory = V4L2_MEMORY_USERPTR;

		q->read_buf->bsize = count; /* preferred size */

		field = videobuf_next_field(q);

		retval = q->ops->buf_prepare(q,q->read_buf,field);

		if (0 != retval) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE