From 84f973626c4c500e90268b5638c1c0b82b6b2f5b Mon Sep 17 00:00:00 2001
From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Date: Thu, 1 Dec 2011 22:32:43 +0100
Subject: [PATCH] --- yaml --- r: 280357 b: refs/heads/master c:
 0118521cc7acb3ccbc1a01d6144ac32be9d56a4c h: refs/heads/master i:   280355:
 76866801aa97f22a17e7cd267fd0d9f72e913549 v: v3

---
 [refs]                         | 2 +-
 trunk/kernel/power/hibernate.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 236f5b7ca1b1..66198f0bec5a 100644
--- 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
index ebf62c3bc9f7..1fcf9de4506d 100644
--- 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();