summaryrefslogtreecommitdiff
path: root/drivers/media/rc/keymaps/Makefile
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2021-02-26 11:37:47 +0100
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-03-11 11:40:28 +0100
commitf09f9f93afad770a04b35235a0aa465fcc8d6e3d (patch)
tree8ede8f189b650e40d7a44810976a841ea69c6988 /drivers/media/rc/keymaps/Makefile
parenta38fd8748464831584a19438cbb3082b5a2dab15 (diff)
media: rc: compile rc-cec.c into rc-core
The rc-cec keymap is unusual in that it can't be built as a module, instead it is registered directly in rc-main.c if CONFIG_MEDIA_CEC_RC is set. This is because it can be called from drm_dp_cec_set_edid() via cec_register_adapter() in an asynchronous context, and it is not allowed to use request_module() to load rc-cec.ko in that case. Trying to do so results in a 'WARN_ON_ONCE(wait && current_is_async())'. Since this keymap is only used if CONFIG_MEDIA_CEC_RC is set, we just compile this keymap into the rc-core module and never as a separate module. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Fixes: 2c6d1fffa1d9 (drm: add support for DisplayPort CEC-Tunneling-over-AUX) Reported-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/rc/keymaps/Makefile')
-rw-r--r--drivers/media/rc/keymaps/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index b252a1d2ebd6..cc6662e1903f 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -21,7 +21,6 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
rc-behold.o \
rc-behold-columbus.o \
rc-budget-ci-old.o \
- rc-cec.o \
rc-cinergy-1400.o \
rc-cinergy.o \
rc-d680-dmb.o \