summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c b/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c
index 1cfe58504553..14335a9e4bb5 100644
--- a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c
+++ b/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;
}