aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/IR/ir-keytable.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/IR/ir-keytable.c')
-rw-r--r--drivers/media/IR/ir-keytable.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index c06b4d50a3dc..9186b45132ed 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -435,7 +435,7 @@ EXPORT_SYMBOL_GPL(ir_g_keycode_from_table);
435 * This routine is used to signal that a key has been released on the 435 * This routine is used to signal that a key has been released on the
436 * remote control. It reports a keyup input event via input_report_key(). 436 * remote control. It reports a keyup input event via input_report_key().
437 */ 437 */
438static void ir_keyup(struct ir_input_dev *ir) 438void ir_keyup(struct ir_input_dev *ir)
439{ 439{
440 if (!ir->keypressed) 440 if (!ir->keypressed)
441 return; 441 return;
@@ -445,6 +445,7 @@ static void ir_keyup(struct ir_input_dev *ir)
445 input_sync(ir->input_dev); 445 input_sync(ir->input_dev);
446 ir->keypressed = false; 446 ir->keypressed = false;
447} 447}
448EXPORT_SYMBOL_GPL(ir_keyup);
448 449
449/** 450/**
450 * ir_timer_keyup() - generates a keyup event after a timeout 451 * ir_timer_keyup() - generates a keyup event after a timeout
@@ -640,6 +641,10 @@ int __ir_input_register(struct input_dev *input_dev,
640 goto out_event; 641 goto out_event;
641 } 642 }
642 643
644 rc = ir_register_input(input_dev);
645 if (rc < 0)
646 goto out_event;
647
643 IR_dprintk(1, "Registered input device on %s for %s remote%s.\n", 648 IR_dprintk(1, "Registered input device on %s for %s remote%s.\n",
644 driver_name, rc_tab->name, 649 driver_name, rc_tab->name,
645 (ir_dev->props && ir_dev->props->driver_type == RC_DRIVER_IR_RAW) ? 650 (ir_dev->props && ir_dev->props->driver_type == RC_DRIVER_IR_RAW) ?