---

yaml --- r: 192961 b: refs/heads/master c: 5fa2989 h: refs/heads/master i: 192959: e2e4875 v: v3
git-mirror · May 19, 2010 · d39980f · d39980f
1 parent 34817d0
commit d39980f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dab7e3106ddd6cbc3b55301228407b9d17ce7773
+refs/heads/master: 5fa2989f78a381ccc1cde219f0a3da942d6c1680
diff --git a/trunk/drivers/media/IR/ir-raw-event.c b/trunk/drivers/media/IR/ir-raw-event.c
@@ -50,9 +50,10 @@ static DEFINE_SPINLOCK(ir_raw_handler_lock);
 	_sumrc;								    \
 })
 
-
+#ifdef MODULE
 /* Used to load the decoders */
 static struct work_struct wq_load;
+#endif
 
 static void ir_raw_event_work(struct work_struct *work)
 {
@@ -218,6 +219,7 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler)
 }
 EXPORT_SYMBOL(ir_raw_handler_unregister);
 
+#ifdef MODULE
 static void init_decoders(struct work_struct *work)
 {
 	/* Load the decoder modules */
@@ -229,6 +231,7 @@ static void init_decoders(struct work_struct *work)
 	   it is needed to change the CONFIG_MODULE test at ir-core.h
 	 */
 }
+#endif
 
 void ir_raw_init(void)
 {

diff --git a/trunk/drivers/media/IR/rc-map.c b/trunk/drivers/media/IR/rc-map.c
@@ -37,14 +37,13 @@ static struct rc_keymap *seek_rc_map(const char *name)
 
 struct ir_scancode_table *get_rc_map(const char *name)
 {
-	int rc = 0;
 
 	struct rc_keymap *map;
 
 	map = seek_rc_map(name);
 #ifdef MODULE
 	if (!map) {
-		rc = request_module(name);
+		int rc = request_module(name);
 		if (rc < 0) {
 			printk(KERN_ERR "Couldn't load IR keymap %s\n", name);
 			return NULL;