[media] media/rc: fix oops on unloading module rc-core

[karo-tx-linux.git] / drivers / media / rc / ir-raw.c

diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
index 97dc8d13b06b386ab2b93293f227a7de37769a29..17c94be9f24c45c56db3704d7d1edbe16b23a767 100644 (file)
--- a/drivers/media/rc/ir-raw.c
+++ b/drivers/media/rc/ir-raw.c
@@ -31,11 +31,6 @@ static DEFINE_MUTEX(ir_raw_handler_lock);
 static LIST_HEAD(ir_raw_handler_list);
 static u64 available_protocols;
 
-#ifdef MODULE
-/* Used to load the decoders */
-static struct work_struct wq_load;
-#endif
-
 static int ir_raw_event_thread(void *data)
 {
        struct ir_raw_event ev;
@@ -347,8 +342,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)
+void ir_raw_init(void)
 {
        /* Load the decoder modules */
 
@@ -365,12 +359,3 @@ static void init_decoders(struct work_struct *work)
           it is needed to change the CONFIG_MODULE test at rc-core.h
         */
 }
-#endif
-
-void ir_raw_init(void)
-{
-#ifdef MODULE
-       INIT_WORK(&wq_load, init_decoders);
-       schedule_work(&wq_load);
-#endif
-}