2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index fdaff5bd6331..6fcc20de48d3 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -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;
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index bd34f81dbc69..9a6bf287e26a 100644
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -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) {