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>
This commit is contained in:
Srivatsa S. Bhat 2011-12-01 22:32:43 +01:00 committed by Rafael J. Wysocki
parent 953a206393
commit 0118521cc7

View File

@ -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();