]> err.no Git - linux-2.6/commitdiff
Fix missing initialization in ir-kbd-gpio.c
authorDmitry Torokhov <dtor_core@ameritech.net>
Sun, 20 Nov 2005 05:57:02 +0000 (00:57 -0500)
committerDmitry Torokhov <dtor_core@ameritech.net>
Sun, 20 Nov 2005 05:57:02 +0000 (00:57 -0500)
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/media/video/ir-kbd-gpio.c

index 5abfc0fbf6de984b6473b990afd5a6ac9280fb66..6345e29e4951c2bb717a9ced1d19b3fdd89c7e52 100644 (file)
@@ -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;