---

yaml --- r: 124587 b: refs/heads/master c: 1970f14 h: refs/heads/master i: 124585: 4d8f15a 124583: acbd37c v: v3
git-mirror · Dec 30, 2008 · fbf8ec3 · fbf8ec3
1 parent cfe2a5d
commit fbf8ec3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de84830e6959b046a99da3be12246458f4ab9825
+refs/heads/master: 1970f14fde9640cc2e238c031498900edbd8ff94
diff --git a/trunk/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c b/trunk/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c
@@ -317,8 +317,10 @@ static int hdcs_set_size(struct sd *sd,
 
 		y = (hdcs->array.height - HDCS_1020_BOTTOM_Y_SKIP - height) / 2
 				+ hdcs->array.top;
-	} else if (height > hdcs->array.height) {
-		height = hdcs->array.height;
+	} else {
+		if (height > hdcs->array.height)
+			height = hdcs->array.height;
+
 		y = hdcs->array.top + (hdcs->array.height - height) / 2;
 	}