diff options
| author | Maxim Levitsky <maximlevitsky@gmail.com> | 2010-07-31 11:59:21 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-08 23:43:00 -0300 |
| commit | b378f43fe9466e7712a8b16be64795ffca3a937e (patch) | |
| tree | 72b73594094549d049f0dcdd653135f42e3f2b29 /include/media/ir-core.h | |
| parent | 86ff071cad3e7e4c7469b3941bfced6fe9b04b5f (diff) | |
| download | op-kernel-dev-b378f43fe9466e7712a8b16be64795ffca3a937e.zip op-kernel-dev-b378f43fe9466e7712a8b16be64795ffca3a937e.tar.gz | |
V4L/DVB: IR: Allow not to compile keymaps in
Currently, ir device registration fails if keymap requested by driver is not found.
Fix that by always compiling in the empty keymap, and using it as a failback.
Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/ir-core.h')
| -rw-r--r-- | include/media/ir-core.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/media/ir-core.h b/include/media/ir-core.h index 513e60d..197d05a 100644 --- a/include/media/ir-core.h +++ b/include/media/ir-core.h @@ -110,8 +110,12 @@ static inline int ir_input_register(struct input_dev *dev, return -EINVAL; ir_codes = get_rc_map(map_name); - if (!ir_codes) - return -EINVAL; + if (!ir_codes) { + ir_codes = get_rc_map(RC_MAP_EMPTY); + + if (!ir_codes) + return -EINVAL; + } rc = __ir_input_register(dev, ir_codes, props, driver_name); if (rc < 0) |
