Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

[mirror_ubuntu-artful-kernel.git] / drivers / media / i2c / s5k6a3.c

diff --git a/drivers/media/i2c/s5k6a3.c b/drivers/media/i2c/s5k6a3.c
index 7bc2271ca009697e75641ca32601c301d12e9896..c11a40850ed15cc307b51bd2934cafac091d99a5 100644 (file)
--- a/drivers/media/i2c/s5k6a3.c
+++ b/drivers/media/i2c/s5k6a3.c
@@ -115,6 +115,7 @@ static void s5k6a3_try_format(struct v4l2_mbus_framefmt *mf)
 
        fmt = find_sensor_format(mf);
        mf->code = fmt->code;
+       mf->field = V4L2_FIELD_NONE;
        v4l_bound_align_image(&mf->width, S5K6A3_SENSOR_MIN_WIDTH,
                              S5K6A3_SENSOR_MAX_WIDTH, 0,
                              &mf->height, S5K6A3_SENSOR_MIN_HEIGHT,