3 files changed, 6 insertions, 3 deletions

diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index fb394a0d838c..336fc284fa52 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -772,7 +772,7 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)
         input_dev->name = DRIVER_NAME " remote control";
         input_dev->phys = cinergyt2->phys;
         input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
-        for (i = 0; ARRAY_SIZE(rc_keys); i += 3)
+        for (i = 0; i < ARRAY_SIZE(rc_keys); i += 3)
                 set_bit(rc_keys[i + 2], input_dev->keybit);
         input_dev->keycodesize = 0;
         input_dev->keycodemax = 0;
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)
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
                  pci_name(sub->core->pci));
 
-        ir->sub = sub;
         ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
         input_dev->name = ir->name;
         input_dev->phys = ir->phys;
@@ -688,6 +687,9 @@ static int ir_probe(struct device *dev)
         }
         input_dev->cdev.dev = &sub->core->pci->dev;
 
+        ir->input = input_dev;
+        ir->sub = sub;
+
         if (ir->polling) {
                 INIT_WORK(&ir->work, ir_work, ir);
                 init_timer(&ir->timer);
@@ -708,7 +710,6 @@ static int ir_probe(struct device *dev)
         /* all done */
         dev_set_drvdata(dev, ir);
         input_register_device(ir->input);
-        printk(DEVNAME ": %s detected at %s\n",ir->name,ir->phys);
 
         /* the remote isn't as bouncy as a keyboard */
         ir->input->rep[REP_DELAY] = repeat_delay;
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index e648cc3bc96d..ab75ca5ac356 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -713,6 +713,8 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 return -ENOMEM;
         }
 
+        ir->dev = input_dev;
+
         /* init hardware-specific stuff */
         ir->mask_keycode = mask_keycode;
         ir->mask_keydown = mask_keydown;