diff --git a/[refs] b/[refs]
index b7b28c7ea410..cda10dd6bd38 100644
--- 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
index 1cfe58504553..14335a9e4bb5 100644
--- 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;
 	}