---

yaml --- r: 291862 b: refs/heads/master c: 05b4877 h: refs/heads/master v: v3
git-mirror · Mar 4, 2012 · 723da42 · 723da42
1 parent 37c086f
commit 723da42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4782e1654bdbd30cf307da090b3c4f70157477cb
+refs/heads/master: 05b4877f6a4f1ba4952d1222213d262bf8c132b7
diff --git a/trunk/kernel/power/hibernate.c b/trunk/kernel/power/hibernate.c
@@ -618,15 +618,15 @@ int hibernate(void)
 	/* Allocate memory management structures */
 	error = create_basic_memory_bitmaps();
 	if (error)
-		goto Exit;
+		goto Enable_umh;
 
 	printk(KERN_INFO "PM: Syncing filesystems ... ");
 	sys_sync();
 	printk("done.\n");
 
 	error = freeze_processes();
 	if (error)
-		goto Finish;
+		goto Free_bitmaps;
 
 	error = hibernation_snapshot(hibernation_mode == HIBERNATION_PLATFORM);
 	if (error || freezer_test_done)
@@ -659,8 +659,9 @@ int hibernate(void)
 	/* Don't bother checking whether freezer_test_done is true */
 	freezer_test_done = false;
 
- Finish:
+ Free_bitmaps:
 	free_basic_memory_bitmaps();
+ Enable_umh:
 	usermodehelper_enable();
  Exit:
 	pm_notifier_call_chain(PM_POST_HIBERNATION);