diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-09-01 18:36:10 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 12:30:35 -0300 |
| commit | b31e341be01475e016842a662946b4fc9cff6bd4 (patch) | |
| tree | 8dfef09aa562b63a196388ce3630b5e972355cc8 /drivers | |
| parent | f2a49bc72bd2993356b3640cc105646ae56b10b8 (diff) | |
| download | op-kernel-dev-b31e341be01475e016842a662946b4fc9cff6bd4.zip op-kernel-dev-b31e341be01475e016842a662946b4fc9cff6bd4.tar.gz | |
V4L/DVB (4584): Fix VIDIOC_S_FMT min/max check in pvrusb2
Acked-by: Mike Isely <isely@pobox.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 5f5438a..3608c2f 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -468,18 +468,18 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, lmin = pvr2_ctrl_get_min(hcp); lmax = pvr2_ctrl_get_max(hcp); - if (h < lmin) { - h = lmin; - } else if (h > lmax) { - h = lmax; - } - lmin = pvr2_ctrl_get_min(vcp); - lmax = pvr2_ctrl_get_max(vcp); if (w < lmin) { w = lmin; } else if (w > lmax) { w = lmax; } + lmin = pvr2_ctrl_get_min(vcp); + lmax = pvr2_ctrl_get_max(vcp); + if (h < lmin) { + h = lmin; + } else if (h > lmax) { + h = lmax; + } memcpy(vf, &pvr_format[PVR_FORMAT_PIX], sizeof(struct v4l2_format)); |
