diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-09-01 18:36:10 -0300 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-09-01 18:36:10 -0300 |
| commit | e4d0666bfedfb3b815ed2b854e8f6754f4d1723c (patch) | |
| tree | 72564ba7564b7a41dbdd9354e8774e1afb780a90 /linux | |
| parent | efb6ed2c83300645cecca27f8b948d6e0380b52d (diff) | |
| download | mediapointer-dvb-s2-e4d0666bfedfb3b815ed2b854e8f6754f4d1723c.tar.gz mediapointer-dvb-s2-e4d0666bfedfb3b815ed2b854e8f6754f4d1723c.tar.bz2 | |
Fix VIDIOC_S_FMT min/max check in pvrusb2
From: Hans Verkuil <hverkuil@xs4all.nl>
Acked-by: Mike Isely <isely@pobox.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 1e4be1e4e..3d3967d56 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -484,18 +484,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)); |