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>

diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 5f5438aca136cf46b7ce15cd44001cbed6fca626..3608c2f81df912fa91a6bc33a7db57691d452cd9 100644 (file)
--- 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));