Skip to content

L
linux-davinci-2.6.23
Commit d4892279 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files
Options

Fix missing initialization in ir-kbd-gpio.c 

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent d271d1c2
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
drivers/media/video/ir-kbd-gpio.c
View file @ d4892279
...@@ -673,7 +673,6 @@ static int ir_probe(struct device *dev) ...@@ -673,7 +673,6 @@ static int ir_probe(struct device *dev)
snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
pci_name(sub->core->pci)); pci_name(sub->core->pci));
ir->sub = sub;
ir_input_init(input_dev, &ir->ir, ir_type, ir_codes); ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
input_dev->name = ir->name; input_dev->name = ir->name;
input_dev->phys = ir->phys; input_dev->phys = ir->phys;
...@@ -688,6 +687,9 @@ static int ir_probe(struct device *dev) ...@@ -688,6 +687,9 @@ static int ir_probe(struct device *dev)
} }
input_dev->cdev.dev = &sub->core->pci->dev; input_dev->cdev.dev = &sub->core->pci->dev;
ir->input = input_dev;
ir->sub = sub;
if (ir->polling) { if (ir->polling) {
INIT_WORK(&ir->work, ir_work, ir); INIT_WORK(&ir->work, ir_work, ir);
init_timer(&ir->timer); init_timer(&ir->timer);
...@@ -708,7 +710,6 @@ static int ir_probe(struct device *dev) ...@@ -708,7 +710,6 @@ static int ir_probe(struct device *dev)
/* all done */ /* all done */
dev_set_drvdata(dev, ir); dev_set_drvdata(dev, ir);
input_register_device(ir->input); 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 */ /* the remote isn't as bouncy as a keyboard */
ir->input->rep[REP_DELAY] = repeat_delay; ir->input->rep[REP_DELAY] = repeat_delay;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment