]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] rc: ir-raw: Load ir-sharp-decoder module at init
authorJames Hogan <james.hogan@imgtec.com>
Wed, 5 Feb 2014 22:15:16 +0000 (19:15 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Thu, 6 Feb 2014 11:18:30 +0000 (09:18 -0200)
Commit 1d184b0bc13d ([media] media: rc: add raw decoder for Sharp
protocol) added a new raw IR decoder for the sharp protocol, but didn't
add the code to load the module at init as is done for other raw
decoders, so add that code now.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/rc/ir-raw.c
drivers/media/rc/rc-core-priv.h

index 5c42750c7b7152fc7cb9b3ea886e45798011bb87..79a9cb653604ce82aed2ab4752cc385a32e71cea 100644 (file)
@@ -352,6 +352,7 @@ void ir_raw_init(void)
        load_jvc_decode();
        load_sony_decode();
        load_sanyo_decode();
+       load_sharp_decode();
        load_mce_kbd_decode();
        load_lirc_codec();
 
index c40d6660acac35e3bc0b684141b2e58f076faf0f..dc3b0b798035dfa7195617a962791e7f7f6926ce 100644 (file)
@@ -210,6 +210,13 @@ static inline void load_sony_decode(void) { }
 static inline void load_sanyo_decode(void) { }
 #endif
 
+/* from ir-sharp-decoder.c */
+#ifdef CONFIG_IR_SHARP_DECODER_MODULE
+#define load_sharp_decode()    request_module_nowait("ir-sharp-decoder")
+#else
+static inline void load_sharp_decode(void) { }
+#endif
+
 /* from ir-mce_kbd-decoder.c */
 #ifdef CONFIG_IR_MCE_KBD_DECODER_MODULE
 #define load_mce_kbd_decode()  request_module_nowait("ir-mce_kbd-decoder")