diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-11-20 00:57:02 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-11-20 00:57:02 -0500 |
| commit | d4892279d786dd11f9d6269b3029ad3340e79597 (patch) | |
| tree | 865fc2a2da5db31fa931fa741dec491fc02e21c7 /drivers | |
| parent | d271d1c2217b2e9868c32c0437d76b2af3a4b971 (diff) | |
| download | linux-stable-d4892279d786dd11f9d6269b3029ad3340e79597.tar.gz linux-stable-d4892279d786dd11f9d6269b3029ad3340e79597.tar.bz2 linux-stable-d4892279d786dd11f9d6269b3029ad3340e79597.zip | |
Fix missing initialization in ir-kbd-gpio.c
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/ir-kbd-gpio.c | 5 |
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) 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; |