diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-04-02 22:49:12 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-04-02 22:49:12 +0200 |
| commit | 65e6f0b461da6590830416b104c665f147f13178 (patch) | |
| tree | cce33e89918b1763fda0f7806d2f39cfa0e7ebb5 /kernel/power | |
| parent | d8ca466b14410314d0c1dbe58ad57c44d789cd25 (diff) | |
| parent | 8aa122f38398503c72a83f15c815e84e6e6e6890 (diff) | |
| download | kernel_samsung_crespo-65e6f0b461da6590830416b104c665f147f13178.zip kernel_samsung_crespo-65e6f0b461da6590830416b104c665f147f13178.tar.gz kernel_samsung_crespo-65e6f0b461da6590830416b104c665f147f13178.tar.bz2 | |
Merge branch 'linux-3.0.y' into cm.ics
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/hibernate.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 8f7b1db..8884c27 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -623,7 +623,7 @@ 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(); @@ -631,7 +631,7 @@ int hibernate(void) error = prepare_processes(); if (error) - goto Finish; + goto Free_bitmaps; if (hibernation_test(TEST_FREEZER)) goto Thaw; @@ -663,8 +663,9 @@ int hibernate(void) Thaw: thaw_processes(); - Finish: + Free_bitmaps: free_basic_memory_bitmaps(); + Enable_umh: usermodehelper_enable(); Exit: pm_notifier_call_chain(PM_POST_HIBERNATION); |