diff --git a/[refs] b/[refs]
index fc9f2982b7ab..cd74c0069fa0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c5db22d280302c33dafb309c25bf2841fb99c37
+refs/heads/master: e24e2e64c468c8060bb7173abecdf11d00ed5751
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index 68d05d2f4d8a..5d437bffd8dc 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -2178,6 +2178,14 @@ 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!  Wake up anyone waiting for it. */
 	mod->state = MODULE_STATE_LIVE;