diff options
Diffstat (limited to 'drivers/media/video')
-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 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)); |