git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
kernel
/
power
/
hibernate.c
diff --git
a/kernel/power/hibernate.c
b/kernel/power/hibernate.c
index
196c012
..
a6b0503
100644
(file)
--- a/
kernel/power/hibernate.c
+++ b/
kernel/power/hibernate.c
@@
-347,7
+347,7
@@
int hibernation_snapshot(int platform_mode)
error = freeze_kernel_threads();
if (error)
error = freeze_kernel_threads();
if (error)
- goto Cl
ose
;
+ goto Cl
eanup
;
if (hibernation_test(TEST_FREEZER) ||
hibernation_testmode(HIBERNATION_TESTPROC)) {
if (hibernation_test(TEST_FREEZER) ||
hibernation_testmode(HIBERNATION_TESTPROC)) {
@@
-357,12
+357,14
@@
int hibernation_snapshot(int platform_mode)
* successful freezer test.
*/
freezer_test_done = true;
* successful freezer test.
*/
freezer_test_done = true;
- goto Cl
ose
;
+ goto Cl
eanup
;
}
error = dpm_prepare(PMSG_FREEZE);
}
error = dpm_prepare(PMSG_FREEZE);
- if (error)
- goto Complete_devices;
+ if (error) {
+ dpm_complete(msg);
+ goto Cleanup;
+ }
suspend_console();
pm_restrict_gfp_mask();
suspend_console();
pm_restrict_gfp_mask();
@@
-391,8
+393,6
@@
int hibernation_snapshot(int platform_mode)
pm_restore_gfp_mask();
resume_console();
pm_restore_gfp_mask();
resume_console();
-
- Complete_devices:
dpm_complete(msg);
Close:
dpm_complete(msg);
Close:
@@
-402,6
+402,10
@@
int hibernation_snapshot(int platform_mode)
Recover_platform:
platform_recover(platform_mode);
goto Resume_devices;
Recover_platform:
platform_recover(platform_mode);
goto Resume_devices;
+
+ Cleanup:
+ swsusp_free();
+ goto Close;
}
/**
}
/**