]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
media: ov9650: remove unnecessary terminated entry in menu items array
authorAkinobu Mita <akinobu.mita@gmail.com>
Mon, 23 Oct 2017 17:30:26 +0000 (13:30 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 31 Oct 2017 16:09:44 +0000 (12:09 -0400)
The test_pattern_menu[] array has two valid items and a null terminated
item.  So the control's maximum value which is passed to
v4l2_ctrl_new_std_menu_items() should be one.  However,
'ARRAY_SIZE(test_pattern_menu) - 1' is actually passed and it's not
correct.

Fix it by removing unnecessary terminated entry and let the correct
control's maximum value be passed to v4l2_ctrl_new_std_menu_items().

Cc: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/i2c/ov9650.c

index 6ffb460e8589e79374dc58602f9107b425d1d668..69433e1e25335b263140e8a131a8a184d441573c 100644 (file)
@@ -985,7 +985,6 @@ static const struct v4l2_ctrl_ops ov965x_ctrl_ops = {
 static const char * const test_pattern_menu[] = {
        "Disabled",
        "Color bars",
-       NULL
 };
 
 static int ov965x_initialize_controls(struct ov965x *ov965x)