1 files changed, 12 insertions, 3 deletions

diff --git a/kernel/module.c b/kernel/module.c
index be4807fb90e4..5d437bffd8dc 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2178,10 +2178,20 @@ sys_init_module(void __user *umod,
                 wake_up(&module_wq);
                 return ret;
         }
+        if (ret > 0) {
+                printk(KERN_WARNING "%s: '%s'->init suspiciously returned %d, "
+                                    "it should follow 0/-E convention\n"
+                       KERN_WARNING "%s: loading module anyway...\n",
+                       __func__, mod->name, ret,
+                       __func__);
+                dump_stack();
+        }
 
-        /* Now it's a first class citizen! */
-        mutex_lock(&module_mutex);
+        /* Now it's a first class citizen!  Wake up anyone waiting for it. */
         mod->state = MODULE_STATE_LIVE;
+        wake_up(&module_wq);
+
+        mutex_lock(&module_mutex);
         /* Drop initial reference. */
         module_put(mod);
         unwind_remove_table(mod->unwind_info, 1);
@@ -2190,7 +2200,6 @@ sys_init_module(void __user *umod,
         mod->init_size = 0;
         mod->init_text_size = 0;
         mutex_unlock(&module_mutex);
-        wake_up(&module_wq);
 
         return 0;
 }