From: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Date: Thu, 1 Dec 2011 21:32:43 +0000 (+0100)
Subject: PM / Hibernate: Enable usermodehelpers in software_resume() error path
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0118521cc7acb3ccbc1a01d6144ac32be9d56a4c;p=linux-beck.git

PM / Hibernate: Enable usermodehelpers in software_resume() error path

In the software_resume() function defined in kernel/power/hibernate.c,
if the call to create_basic_memory_bitmaps() fails, the usermodehelpers
are not enabled (which had been disabled in the previous step). Fix it.

Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index ebf62c3bc9f7..1fcf9de4506d 100644
--- a/kernel/power/hibernate.c
+++ b/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();