summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-11-20 06:56:54 +0100
committerDmitry Torokhov <dtor_core@ameritech.net>2005-11-20 06:56:54 +0100
commitd271d1c2217b2e9868c32c0437d76b2af3a4b971 (patch)
treeb5f691d8196d9c12f219126c30248496babe30df /drivers/media
parentInput: make serio and gameport more swsusp friendly (diff)
downloadlinux-d271d1c2217b2e9868c32c0437d76b2af3a4b971.tar.xz
linux-d271d1c2217b2e9868c32c0437d76b2af3a4b971.zip
Fix an OOPS when initializing IR remote on saa7134
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index e648cc3bc96d..ab75ca5ac356 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -713,6 +713,8 @@ int saa7134_input_init1(struct saa7134_dev *dev)
return -ENOMEM;
}
+ ir->dev = input_dev;
+
/* init hardware-specific stuff */
ir->mask_keycode = mask_keycode;
ir->mask_keydown = mask_keydown;