]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
media: v4l2: Test type instead of cfg->type in v4l2_ctrl_new_custom()
authorBoris Brezillon <boris.brezillon@collabora.com>
Wed, 19 Jun 2019 09:21:33 +0000 (05:21 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Aug 2019 07:34:50 +0000 (09:34 +0200)
commita616b5631aa571d453cf4527ad422c2b8d07fb6e
tree6475c67a0945239b44c5892edd096c95eced5d3b
parentdc427deccae37d44ebc0943a1e50a18792adfb59
media: v4l2: Test type instead of cfg->type in v4l2_ctrl_new_custom()

commit 07d89227a983df957a6a7c56f7c040cde9ac571f upstream.

cfg->type can be overridden by v4l2_ctrl_fill() and the new value is
stored in the local type var. Fix the tests to use this local var.

Fixes: 0996517cf8ea ("V4L/DVB: v4l2: Add new control handling framework")
Cc: <stable@vger.kernel.org>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
[hverkuil-cisco@xs4all.nl: change to !qmenu and !qmenu_int (checkpatch)]
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/v4l2-core/v4l2-ctrls.c