diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-26 02:07:45 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-26 02:07:45 -0200 |
| commit | 0112b169f6a802bc14c7d9c52eed37f5990dfa93 (patch) | |
| tree | 3d9a28f99541f1f5d7a1fef224daf340e8e92c45 /linux/drivers/media/video/bt8xx/bttv-driver.c | |
| parent | 6d67fdc302e1b986dcbd6729167116a4463f1f03 (diff) | |
| parent | c8f0e62f66c8fae8399d077e41c8cbab137b3d4f (diff) | |
| download | mediapointer-dvb-s2-0112b169f6a802bc14c7d9c52eed37f5990dfa93.tar.gz mediapointer-dvb-s2-0112b169f6a802bc14c7d9c52eed37f5990dfa93.tar.bz2 | |
merge: http://linuxtv.org/hg/~tmerle/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index d573ae72c..37db47ecc 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -2922,10 +2922,6 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, if (NULL == fmt) return -EINVAL; mutex_lock(&fh->cap.lock); - if (fmt->depth != pic->depth) { - 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 @@ -3158,6 +3154,8 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, vm->width,vm->height,field); if (0 != retval) goto fh_unlock_and_return; + btv->init.width = vm->width; + btv->init.height = vm->height; spin_lock_irqsave(&btv->s_lock,flags); buffer_queue(&fh->cap,&buf->vb); spin_unlock_irqrestore(&btv->s_lock,flags); |