diff options
Diffstat (limited to 'kernel/power/hibernate.c')
| -rw-r--r-- | kernel/power/hibernate.c | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 2b4a946a6ff5..8d35b9f9aaa3 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -786,9 +786,9 @@ int hibernate(void)  	unlock_device_hotplug();  	if (snapshot_test) {  		pm_pr_dbg("Checking hibernation image\n"); -		error = swsusp_check(snapshot_test); +		error = swsusp_check(false);  		if (!error) -			error = load_image_and_restore(snapshot_test); +			error = load_image_and_restore(false);  	}  	thaw_processes(); @@ -945,14 +945,14 @@ static int software_resume(void)  	pm_pr_dbg("Looking for hibernation image.\n");  	mutex_lock(&system_transition_mutex); -	error = swsusp_check(false); +	error = swsusp_check(true);  	if (error)  		goto Unlock;  	/* The snapshot device should not be opened while we're running */  	if (!hibernate_acquire()) {  		error = -EBUSY; -		swsusp_close(false); +		swsusp_close(true);  		goto Unlock;  	} @@ -973,7 +973,7 @@ static int software_resume(void)  		goto Close_Finish;  	} -	error = load_image_and_restore(false); +	error = load_image_and_restore(true);  	thaw_processes();   Finish:  	pm_notifier_call_chain(PM_POST_RESTORE); @@ -987,7 +987,7 @@ static int software_resume(void)  	pm_pr_dbg("Hibernation image not present or could not be loaded.\n");  	return error;   Close_Finish: -	swsusp_close(false); +	swsusp_close(true);  	goto Finish;  }  | 
