V4L/DVB (10127): stv06xx: Avoid having y unitialized

As pointed by gcc:

drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c: In function ‘hdcs_set_size’:
drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c:301: warning: ‘y’ may be used uninitialized in this function

Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c b/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c
index 1cfe585045539b9baa10e2007e34caef9931cbc3..14335a9e4bb575ecd805bfbe42aaefab256ef426 100644 (file)
--- 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;
        }