diff options
| author | Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> | 2011-12-01 22:32:43 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-12-06 22:07:51 +0100 |
| commit | 0118521cc7acb3ccbc1a01d6144ac32be9d56a4c (patch) | |
| tree | 2345c7754856f34efc7ac8f1ced88febb99d25ff /kernel | |
| parent | 953a206393b1533ceb0e7d725cc5a8c8d7ed97dd (diff) | |
| download | olio-linux-3.10-0118521cc7acb3ccbc1a01d6144ac32be9d56a4c.tar.xz olio-linux-3.10-0118521cc7acb3ccbc1a01d6144ac32be9d56a4c.zip | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/hibernate.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index ebf62c3bc9f..1fcf9de4506 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(); |