summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorRicardo Cerqueira <devnull@localhost>2005-12-08 02:55:39 +0000
committerRicardo Cerqueira <devnull@localhost>2005-12-08 02:55:39 +0000
commitbe3654f86891a551c40f745531f7e97223b0a654 (patch)
tree30ee462119ca3410c699a0c819998c8f7b0c4b9b /linux
parent0c9344956020e6809f4653a28a511e31ffca34f2 (diff)
downloadmediapointer-dvb-s2-be3654f86891a551c40f745531f7e97223b0a654.tar.gz
mediapointer-dvb-s2-be3654f86891a551c40f745531f7e97223b0a654.tar.bz2
More input layer backports
From: Ricardo Cerqueira <v4l@cerqueira.org> kernel-sync (Bugfix at ir-kbd-gpio) Updated experimental bttv-input Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/ir-kbd-gpio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ir-kbd-gpio.c b/linux/drivers/media/video/ir-kbd-gpio.c
index 01bdb0def..2b8aaf72d 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.23 2005/12/04 01:12:43 rmcc Exp $
+ * $Id: ir-kbd-gpio.c,v 1.24 2005/12/08 02:55:39 rmcc Exp $
*
* Copyright (c) 2003 Gerd Knorr
* Copyright (c) 2003 Pavel Machek
@@ -672,6 +672,7 @@ static int ir_probe(struct device *dev)
snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
pci_name(sub->core->pci));
+ ir->input = input_dev;
ir->sub = sub;
ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
input_dev->name = ir->name;