Commit 0118521c authored Dec 01, 2011 by Srivatsa S. Bhat Committed by Rafael J. Wysocki Dec 06, 2011

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>

parent 953a2063

kernel/power/hibernate.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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();