diff options
author | Erik Andrén <erik.andren@gmail.com> | 2008-12-30 04:58:36 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 09:40:39 -0200 |
commit | 1970f14fde9640cc2e238c031498900edbd8ff94 (patch) | |
tree | 2721b750c2aa6aeb68c67f4f0562fd4af0358987 | |
parent | de84830e6959b046a99da3be12246458f4ab9825 (diff) | |
download | linux-3.10-1970f14fde9640cc2e238c031498900edbd8ff94.tar.gz linux-3.10-1970f14fde9640cc2e238c031498900edbd8ff94.tar.bz2 linux-3.10-1970f14fde9640cc2e238c031498900edbd8ff94.zip |
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>
-rw-r--r-- | drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 6 |
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 1cfe5850455..14335a9e4bb 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; } |