From: Philipp Zabel Date: Mon, 26 May 2014 13:55:51 +0000 (-0300) Subject: [media] mt9v032: fix hblank calculation X-Git-Tag: v3.17-rc1~112^2~210 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f17bc3f4707eb87bdb80b895911c551cdd606fbd;p=karo-tx-linux.git [media] mt9v032: fix hblank calculation Since (min_row_time - crop->width) can be negative, we have to do a signed comparison here. Otherwise max_t casts the negative value to unsigned int and sets min_hblank to that invalid value. Cc: stable@vger.kernel.org Signed-off-by: Philipp Zabel Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c index 435e9e661bbb..d481ed1452f4 100644 --- a/drivers/media/i2c/mt9v032.c +++ b/drivers/media/i2c/mt9v032.c @@ -305,8 +305,8 @@ mt9v032_update_hblank(struct mt9v032 *mt9v032) if (mt9v032->version->version == MT9V034_CHIP_ID_REV1) min_hblank += (mt9v032->hratio - 1) * 10; - min_hblank = max_t(unsigned int, (int)mt9v032->model->data->min_row_time - crop->width, - (int)min_hblank); + min_hblank = max_t(int, mt9v032->model->data->min_row_time - crop->width, + min_hblank); hblank = max_t(unsigned int, mt9v032->hblank, min_hblank); return mt9v032_write(client, MT9V032_HORIZONTAL_BLANKING, hblank);