diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-06 08:15:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-06 08:15:26 -0300 |
| commit | a54e4ff7ad973562ecb961a02ea8da66e2334aef (patch) | |
| tree | fe475f0216d4971e771364a4fce63e759fd858ac /linux/drivers/media/video/saa7134 | |
| parent | ab62c90c3f2b6debe4c45c66aa08b5a65039e40e (diff) | |
| parent | d336dddd42e43b5465cd58b5a4812011805905df (diff) | |
| download | mediapointer-dvb-s2-a54e4ff7ad973562ecb961a02ea8da66e2334aef.tar.gz mediapointer-dvb-s2-a54e4ff7ad973562ecb961a02ea8da66e2334aef.tar.bz2 | |
merge: http://kernellabs.com/hg/~dheitmueller/misc-fixes-2
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-video.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index 26f1727e6..518de9b2c 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1448,7 +1448,7 @@ video_poll(struct file *file, struct poll_table_struct *wait) } if (!buf) - rc = POLLERR; + goto err; poll_wait(file, &buf->done, wait); if (buf->state == VIDEOBUF_DONE || @@ -1646,15 +1646,8 @@ static int saa7134_try_fmt_vid_cap(struct file *file, void *priv, } f->fmt.pix.field = field; - if (f->fmt.pix.width < 48) - f->fmt.pix.width = 48; - if (f->fmt.pix.height < 32) - f->fmt.pix.height = 32; - if (f->fmt.pix.width > maxw) - f->fmt.pix.width = maxw; - if (f->fmt.pix.height > maxh) - f->fmt.pix.height = maxh; - f->fmt.pix.width &= ~0x03; + v4l_bound_align_image(&f->fmt.pix.width, 48, maxw, 2, + &f->fmt.pix.height, 32, maxh, 0, 0); f->fmt.pix.bytesperline = (f->fmt.pix.width * fmt->depth) >> 3; f->fmt.pix.sizeimage = |