diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-02-20 02:58:43 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-02-20 02:58:43 +0200 |
| commit | 4c4400504f6ada0cfed682fbe7e6c65efbda3952 (patch) | |
| tree | 5452eb39c76081fc871abdf1a38ccf3668f5cb4f /drivers/media/i2c/ov9650.c | |
| parent | d2eaa59000c7717e68a75cf2c106f056d2bc30b4 (diff) | |
| parent | 18922936dc2817488ebba985c5aaf3498f2ef96d (diff) | |
| download | linux-4c4400504f6ada0cfed682fbe7e6c65efbda3952.tar.gz linux-4c4400504f6ada0cfed682fbe7e6c65efbda3952.tar.bz2 linux-4c4400504f6ada0cfed682fbe7e6c65efbda3952.zip | |
Merge remote-tracking branch 'linuxtv/vsp1' into HEAD
Diffstat (limited to 'drivers/media/i2c/ov9650.c')
| -rw-r--r-- | drivers/media/i2c/ov9650.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/i2c/ov9650.c b/drivers/media/i2c/ov9650.c index a0b3c9bde53d..be5a7fd4f076 100644 --- a/drivers/media/i2c/ov9650.c +++ b/drivers/media/i2c/ov9650.c @@ -1046,8 +1046,8 @@ static int ov965x_initialize_controls(struct ov965x *ov965x) ctrls->exposure->flags |= V4L2_CTRL_FLAG_VOLATILE; v4l2_ctrl_auto_cluster(3, &ctrls->auto_wb, 0, false); - v4l2_ctrl_auto_cluster(3, &ctrls->auto_gain, 0, true); - v4l2_ctrl_auto_cluster(3, &ctrls->auto_exp, 1, true); + v4l2_ctrl_auto_cluster(2, &ctrls->auto_gain, 0, true); + v4l2_ctrl_auto_cluster(2, &ctrls->auto_exp, 1, true); v4l2_ctrl_cluster(2, &ctrls->hflip); ov965x->sd.ctrl_handler = hdl; |