aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-09-09 16:04:00 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 16:57:53 -0400
commit67e49a1abe3e9458c7ffba66775b350b5ceffae0 (patch)
treeb4d5b458fcc71aee7129525e8685339334db6d10 /drivers/media/video
parent5129b1589883d6eaa54886f3e0c5d918dafe329e (diff)
[PATCH] v4l: make the input event device for IR matchable by udev rules.
- Makes the input event device created by the V4L drivers for the infrared remote matchable by udev rules. Signed-off-by: Rudo Thomas <rudo@matfyz.cz> Signed-off-by: Michael Fair <michael@daclubhouse.net> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx88/cx88-input.c1
-rw-r--r--drivers/media/video/ir-kbd-gpio.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index d7980c51478d..d81b21d6e05d 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -445,6 +445,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
445 ir->input.id.vendor = pci->vendor; 445 ir->input.id.vendor = pci->vendor;
446 ir->input.id.product = pci->device; 446 ir->input.id.product = pci->device;
447 } 447 }
448 ir->input.dev = &pci->dev;
448 449
449 /* record handles to ourself */ 450 /* record handles to ourself */
450 ir->core = core; 451 ir->core = core;
diff --git a/drivers/media/video/ir-kbd-gpio.c b/drivers/media/video/ir-kbd-gpio.c
index eddadc76e11d..cf292da8fdd5 100644
--- a/drivers/media/video/ir-kbd-gpio.c
+++ b/drivers/media/video/ir-kbd-gpio.c
@@ -353,6 +353,7 @@ static int ir_probe(struct device *dev)
353 ir->input.id.vendor = sub->core->pci->vendor; 353 ir->input.id.vendor = sub->core->pci->vendor;
354 ir->input.id.product = sub->core->pci->device; 354 ir->input.id.product = sub->core->pci->device;
355 } 355 }
356 ir->input.dev = &sub->core->pci->dev;
356 357
357 if (ir->polling) { 358 if (ir->polling) {
358 INIT_WORK(&ir->work, ir_work, ir); 359 INIT_WORK(&ir->work, ir_work, ir);
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 0e97b1eec20e..1f456c4d76f2 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -564,6 +564,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
564 ir->dev.id.vendor = dev->pci->vendor; 564 ir->dev.id.vendor = dev->pci->vendor;
565 ir->dev.id.product = dev->pci->device; 565 ir->dev.id.product = dev->pci->device;
566 } 566 }
567 ir->dev.dev = &dev->pci->dev;
567 568
568 /* all done */ 569 /* all done */
569 dev->remote = ir; 570 dev->remote = ir;