diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-17 11:18:13 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-17 11:18:13 -0700 |
| commit | 0111d0f13469831266d716e3b50d580a3e25cff9 (patch) | |
| tree | e2c082e97808f1303190fae3bb79cb8bf359bf2c /drivers/media/i2c/mt9v032.c | |
| parent | 29a6185d2f78e35b0b36d0ed94bc27d2b71e1ef3 (diff) | |
| parent | af92ba8fd23cb5811d96b833bbb7133efefeb5b9 (diff) | |
Merge tag 'v3.14.19' into linux-linaro-lsk-v3.14lsk-v3.14-14.09
This is the 3.14.19 stable release
Diffstat (limited to 'drivers/media/i2c/mt9v032.c')
| -rw-r--r-- | drivers/media/i2c/mt9v032.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c index 36c504b78f2c..008ac87a9031 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); |