From b9336abc1db463245500c6ba5c3f879668ff8e99 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Fri, 9 Sep 2005 13:04:00 -0700
Subject: [PATCH] --- yaml --- r: 8184 b: refs/heads/master c:
 67e49a1abe3e9458c7ffba66775b350b5ceffae0 h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/video/cx88/cx88-input.c       | 1 +
 trunk/drivers/media/video/ir-kbd-gpio.c           | 1 +
 trunk/drivers/media/video/saa7134/saa7134-input.c | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 289d2aea69b4..cfe9c766da96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5129b1589883d6eaa54886f3e0c5d918dafe329e
+refs/heads/master: 67e49a1abe3e9458c7ffba66775b350b5ceffae0
diff --git a/trunk/drivers/media/video/cx88/cx88-input.c b/trunk/drivers/media/video/cx88/cx88-input.c
index d7980c51478d..d81b21d6e05d 100644
--- a/trunk/drivers/media/video/cx88/cx88-input.c
+++ b/trunk/drivers/media/video/cx88/cx88-input.c
@@ -445,6 +445,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
 		ir->input.id.vendor = pci->vendor;
 		ir->input.id.product = pci->device;
 	}
+	ir->input.dev = &pci->dev;
 
 	/* record handles to ourself */
 	ir->core = core;
diff --git a/trunk/drivers/media/video/ir-kbd-gpio.c b/trunk/drivers/media/video/ir-kbd-gpio.c
index eddadc76e11d..cf292da8fdd5 100644
--- a/trunk/drivers/media/video/ir-kbd-gpio.c
+++ b/trunk/drivers/media/video/ir-kbd-gpio.c
@@ -353,6 +353,7 @@ static int ir_probe(struct device *dev)
 		ir->input.id.vendor  = sub->core->pci->vendor;
 		ir->input.id.product = sub->core->pci->device;
 	}
+	ir->input.dev = &sub->core->pci->dev;
 
 	if (ir->polling) {
 		INIT_WORK(&ir->work, ir_work, ir);
diff --git a/trunk/drivers/media/video/saa7134/saa7134-input.c b/trunk/drivers/media/video/saa7134/saa7134-input.c
index 0e97b1eec20e..1f456c4d76f2 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-input.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-input.c
@@ -564,6 +564,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
 		ir->dev.id.vendor  = dev->pci->vendor;
 		ir->dev.id.product = dev->pci->device;
 	}
+	ir->dev.dev = &dev->pci->dev;
 
 	/* all done */
 	dev->remote = ir;