diff options
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-gpio.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index 0ba6c196b..b58cb3187 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-input.c,v 1.18 2005/09/02 22:00:49 mchehab Exp $ + * $Id: cx88-input.c,v 1.19 2005/09/04 13:36:10 mkrufky Exp $ * * Device driver for GPIO attached remote control interfaces * on Conexant 2388x based TV/DVB cards. @@ -446,7 +446,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->dev.dev = &dev->pci->dev; + ir->input.dev = &pci->dev; /* record handles to ourself */ ir->core = core; diff --git a/linux/drivers/media/video/ir-kbd-gpio.c b/linux/drivers/media/video/ir-kbd-gpio.c index 491183067..ee41576c1 100644 --- a/linux/drivers/media/video/ir-kbd-gpio.c +++ b/linux/drivers/media/video/ir-kbd-gpio.c @@ -1,5 +1,5 @@ /* - * $Id: ir-kbd-gpio.c,v 1.14 2005/09/02 22:00:49 mchehab Exp $ + * $Id: ir-kbd-gpio.c,v 1.15 2005/09/04 13:36:10 mkrufky Exp $ * * Copyright (c) 2003 Gerd Knorr * Copyright (c) 2003 Pavel Machek @@ -355,7 +355,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->dev.dev = &dev->pci->dev; + ir->input.dev = &sub->core->pci->dev; #endif if (ir->polling) { |