aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ir-kbd-gpio.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/ir-kbd-gpio.c')
-rw-r--r--drivers/media/video/ir-kbd-gpio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/ir-kbd-gpio.c b/drivers/media/video/ir-kbd-gpio.c
index 5abfc0fbf6de..6345e29e4951 100644
--- a/drivers/media/video/ir-kbd-gpio.c
+++ b/drivers/media/video/ir-kbd-gpio.c
@@ -673,7 +673,6 @@ static int ir_probe(struct device *dev)
673 snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", 673 snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
674 pci_name(sub->core->pci)); 674 pci_name(sub->core->pci));
675 675
676 ir->sub = sub;
677 ir_input_init(input_dev, &ir->ir, ir_type, ir_codes); 676 ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
678 input_dev->name = ir->name; 677 input_dev->name = ir->name;
679 input_dev->phys = ir->phys; 678 input_dev->phys = ir->phys;
@@ -688,6 +687,9 @@ static int ir_probe(struct device *dev)
688 } 687 }
689 input_dev->cdev.dev = &sub->core->pci->dev; 688 input_dev->cdev.dev = &sub->core->pci->dev;
690 689
690 ir->input = input_dev;
691 ir->sub = sub;
692
691 if (ir->polling) { 693 if (ir->polling) {
692 INIT_WORK(&ir->work, ir_work, ir); 694 INIT_WORK(&ir->work, ir_work, ir);
693 init_timer(&ir->timer); 695 init_timer(&ir->timer);
@@ -708,7 +710,6 @@ static int ir_probe(struct device *dev)
708 /* all done */ 710 /* all done */
709 dev_set_drvdata(dev, ir); 711 dev_set_drvdata(dev, ir);
710 input_register_device(ir->input); 712 input_register_device(ir->input);
711 printk(DEVNAME ": %s detected at %s\n",ir->name,ir->phys);
712 713
713 /* the remote isn't as bouncy as a keyboard */ 714 /* the remote isn't as bouncy as a keyboard */
714 ir->input->rep[REP_DELAY] = repeat_delay; 715 ir->input->rep[REP_DELAY] = repeat_delay;