---

yaml --- r: 280357 b: refs/heads/master c: 0118521 h: refs/heads/master i: 280355: 7686680 v: v3
git-mirror · Dec 6, 2011 · 84f9736 · 84f9736
1 parent 4d5b42e
commit 84f9736
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 953a206393b1533ceb0e7d725cc5a8c8d7ed97dd
+refs/heads/master: 0118521cc7acb3ccbc1a01d6144ac32be9d56a4c
diff --git a/trunk/kernel/power/hibernate.c b/trunk/kernel/power/hibernate.c
@@ -807,8 +807,10 @@ static int software_resume(void)
 		goto close_finish;
 
 	error = create_basic_memory_bitmaps();
-	if (error)
+	if (error) {
+		usermodehelper_enable();
 		goto close_finish;
+	}
 
 	pr_debug("PM: Preparing processes for restore.\n");
 	error = prepare_processes();