summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-11-27 22:29:16 +0000
committerMichael Krufky <devnull@localhost>2005-11-27 22:29:16 +0000
commit85af92b0d83f8f1de9fc774046b3c7e16fc14ac5 (patch)
treeec26da7674b8220bd65d86d173fda5bfe6ff505b /linux/drivers
parentd982d0785dbabdb747d4804e3fda64edc274bfc1 (diff)
downloadmediapointer-dvb-s2-85af92b0d83f8f1de9fc774046b3c7e16fc14ac5.tar.gz
mediapointer-dvb-s2-85af92b0d83f8f1de9fc774046b3c7e16fc14ac5.tar.bz2
kernel-sync
- Fix an OOPS when initializing IR remote on saa7134 Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-input.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index 35d0433fa..f0da9e6a5 100644
--- a/linux/drivers/media/video/saa7134/saa7134-input.c
+++ b/linux/drivers/media/video/saa7134/saa7134-input.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-input.c,v 1.41 2005/11/08 16:37:02 rmcc Exp $
+ * $Id: saa7134-input.c,v 1.42 2005/11/27 22:29:16 mkrufky Exp $
*
* handle saa7134 IR remotes via linux kernel input layer.
*
@@ -722,6 +722,8 @@ int saa7134_input_init1(struct saa7134_dev *dev)
return -ENOMEM;
memset(ir,0,sizeof(*ir));
+ ir->dev = input_dev;
+
/* init hardware-specific stuff */
ir->mask_keycode = mask_keycode;
ir->mask_keydown = mask_keydown;