aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-09-01 17:36:10 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 11:30:35 -0400
commitb31e341be01475e016842a662946b4fc9cff6bd4 (patch)
tree8dfef09aa562b63a196388ce3630b5e972355cc8 /drivers
parentf2a49bc72bd2993356b3640cc105646ae56b10b8 (diff)
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.c14
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 5f5438aca136..3608c2f81df9 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,
468 468
469 lmin = pvr2_ctrl_get_min(hcp); 469 lmin = pvr2_ctrl_get_min(hcp);
470 lmax = pvr2_ctrl_get_max(hcp); 470 lmax = pvr2_ctrl_get_max(hcp);
471 if (h < lmin) {
472 h = lmin;
473 } else if (h > lmax) {
474 h = lmax;
475 }
476 lmin = pvr2_ctrl_get_min(vcp);
477 lmax = pvr2_ctrl_get_max(vcp);
478 if (w < lmin) { 471 if (w < lmin) {
479 w = lmin; 472 w = lmin;
480 } else if (w > lmax) { 473 } else if (w > lmax) {
481 w = lmax; 474 w = lmax;
482 } 475 }
476 lmin = pvr2_ctrl_get_min(vcp);
477 lmax = pvr2_ctrl_get_max(vcp);
478 if (h < lmin) {
479 h = lmin;
480 } else if (h > lmax) {
481 h = lmax;
482 }
483 483
484 memcpy(vf, &pvr_format[PVR_FORMAT_PIX], 484 memcpy(vf, &pvr_format[PVR_FORMAT_PIX],
485 sizeof(struct v4l2_format)); 485 sizeof(struct v4l2_format));