From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Sun, 20 Nov 2005 05:56:54 +0000 (-0500)
Subject: Fix an OOPS when initializing IR remote on saa7134
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d271d1c2217b2e9868c32c0437d76b2af3a4b971;p=deliverable%2Flinux.git

Fix an OOPS when initializing IR remote on saa7134

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

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;