summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-11-29 08:19:59 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 18:42:21 -0200
commit055cd55601f948675006ca90362fc2bfaae90a86 (patch)
treea878c55c30b0ae30334f3523d8dd67940d32a7f3 /include
parent0278155c84af42d78785731263b69fb49f945ea7 (diff)
downloadlinux-055cd55601f948675006ca90362fc2bfaae90a86.tar.bz2
V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
Currently, the IR table is initialized by calling ir_input_init(). However, this function doesn't return any error code, nor has a function to be called when de-initializing the IR's. Change the return argment to integer and make sure that each driver will handle the error code. Also adds a function to free any resources that may be allocating there: ir_input_free(). Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/media/ir-common.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index cd21cb55d5d5..16b8f17bcfec 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -100,7 +100,7 @@ struct card_ir {
/* Routines from ir-functions.c */
-void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
+int ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
int ir_type, struct ir_scancode_table *ir_codes);
void ir_input_nokey(struct input_dev *dev, struct ir_input_state *ir);
void ir_input_keydown(struct input_dev *dev, struct ir_input_state *ir,
@@ -121,6 +121,7 @@ u32 ir_g_keycode_from_table(struct input_dev *input_dev,
int ir_set_keycode_table(struct input_dev *input_dev,
struct ir_scancode_table *rc_tab);
+void ir_input_free(struct input_dev *input_dev);
/* scancode->keycode map tables from ir-keymaps.c */