]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
media: vivid: fix module load error when enabling fb and no_error_inj=1
authorHans Verkuil <hans.verkuil@cisco.com>
Thu, 25 Jan 2018 11:57:45 +0000 (06:57 -0500)
committerSeth Forshee <seth.forshee@canonical.com>
Thu, 22 Feb 2018 14:18:50 +0000 (08:18 -0600)
commit96f770dfeb2937e96c5fed772cb2e0cf4a92e0c9
tree4c229e50353652ebd455f1214f9269b57dc37c3d
parentf42c35fc4eee8a9b1a7bc639c2c8f3e869bd14e0
media: vivid: fix module load error when enabling fb and no_error_inj=1

BugLink: http://bugs.launchpad.net/bugs/1751064
commit 0fa2c5f954c41e870fe327907c01cb8f7ea8d5a2 upstream.

If the framebuffer is enabled and error injection is disabled, then
creating the controls for the video output device would fail with an
error.

This is because the Clear Framebuffer control uses the 'vivid control
class' and that control class isn't added if error injection is disabled.

In addition, this control was added to e.g. vbi devices as well, which
makes no sense.

Move this control to its own control handler and handle it correctly.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
drivers/media/platform/vivid/vivid-core.h
drivers/media/platform/vivid/vivid-ctrls.c