From fe190e4a2ad78624adef04b447b8debce39c6f10 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri, 1 Sep 2006 18:36:10 -0300
Subject: [PATCH] --- yaml --- r: 37448 b: refs/heads/master c:
 b31e341be01475e016842a662946b4fc9cff6bd4 h: refs/heads/master v: v3

---
 [refs]                                           |  2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c47a1ca6b033..ae627587a23d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2a49bc72bd2993356b3640cc105646ae56b10b8
+refs/heads/master: b31e341be01475e016842a662946b4fc9cff6bd4
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 5f5438aca136..3608c2f81df9 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/trunk/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));