diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-10 08:19:11 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-10 08:19:11 +0200 |
| commit | 76a315a6b2c7ca3ba8c74919b49f95d9337e4c1f (patch) | |
| tree | 47aabbd33c80cffc07621b1d6fb5b4fa57c2db01 /drivers/media/i2c/ov9650.c | |
| parent | 7fa58b5c60298c7b6bf665f896479e26645bf9a6 (diff) | |
| parent | 300893b08f3bc7057a7a5f84074090ba66c8b5ca (diff) | |
| download | kernel_goldelico_gta04-76a315a6b2c7ca3ba8c74919b49f95d9337e4c1f.zip kernel_goldelico_gta04-76a315a6b2c7ca3ba8c74919b49f95d9337e4c1f.tar.gz kernel_goldelico_gta04-76a315a6b2c7ca3ba8c74919b49f95d9337e4c1f.tar.bz2 | |
merge linus/master (3.12-rc0); fixed conflicts
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Diffstat (limited to 'drivers/media/i2c/ov9650.c')
| -rw-r--r-- | drivers/media/i2c/ov9650.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/ov9650.c b/drivers/media/i2c/ov9650.c index 1dbb811..4da90c6 100644 --- a/drivers/media/i2c/ov9650.c +++ b/drivers/media/i2c/ov9650.c @@ -1083,7 +1083,7 @@ static int ov965x_enum_frame_sizes(struct v4l2_subdev *sd, { int i = ARRAY_SIZE(ov965x_formats); - if (fse->index > ARRAY_SIZE(ov965x_framesizes)) + if (fse->index >= ARRAY_SIZE(ov965x_framesizes)) return -EINVAL; while (--i) |