diff options
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 0ccac702bea4..b12770848c00 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
| @@ -1111,15 +1111,8 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, | |||
| 1111 | } | 1111 | } |
| 1112 | 1112 | ||
| 1113 | f->fmt.pix.field = field; | 1113 | f->fmt.pix.field = field; |
| 1114 | if (f->fmt.pix.height < 32) | 1114 | v4l_bound_align_image(&f->fmt.pix.width, 48, maxw, 2, |
| 1115 | f->fmt.pix.height = 32; | 1115 | &f->fmt.pix.height, 32, maxh, 0, 0); |
| 1116 | if (f->fmt.pix.height > maxh) | ||
| 1117 | f->fmt.pix.height = maxh; | ||
| 1118 | if (f->fmt.pix.width < 48) | ||
| 1119 | f->fmt.pix.width = 48; | ||
| 1120 | if (f->fmt.pix.width > maxw) | ||
| 1121 | f->fmt.pix.width = maxw; | ||
| 1122 | f->fmt.pix.width &= ~0x03; | ||
| 1123 | f->fmt.pix.bytesperline = | 1116 | f->fmt.pix.bytesperline = |
| 1124 | (f->fmt.pix.width * fmt->depth) >> 3; | 1117 | (f->fmt.pix.width * fmt->depth) >> 3; |
| 1125 | f->fmt.pix.sizeimage = | 1118 | f->fmt.pix.sizeimage = |