]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: v4l2-ctrl: Initialize _BUTTON and _CTRL_CLASS
authorEzequiel Garcia <ezequiel@collabora.com>
Thu, 6 Jun 2019 16:12:53 +0000 (12:12 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 21 Jun 2019 20:18:33 +0000 (16:18 -0400)
These two control types don't really need a default value,
as they are not expected to carry any value.

However, it's slightly clearer to initialize them explicitly
instead of falling back to the switch default.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/v4l2-core/v4l2-ctrls.c

index f2b9bdedbf8cfc94208c25764af78867f37dd654..2d7525e2d9eb6e6d8250538fce0cfda8d63775ba 100644 (file)
@@ -1520,6 +1520,10 @@ static void std_init(const struct v4l2_ctrl *ctrl, u32 idx,
        case V4L2_CTRL_TYPE_BOOLEAN:
                ptr.p_s32[idx] = ctrl->default_value;
                break;
+       case V4L2_CTRL_TYPE_BUTTON:
+       case V4L2_CTRL_TYPE_CTRL_CLASS:
+               ptr.p_s32[idx] = 0;
+               break;
        case V4L2_CTRL_TYPE_U8:
                ptr.p_u8[idx] = ctrl->default_value;
                break;