diff options
| author | James Morris <jmorris@namei.org> | 2011-06-30 10:43:56 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-06-30 10:43:56 +0200 |
| commit | 5b944a71a192977c1c018bbcfa0c52dca48e2368 (patch) | |
| tree | 9f234c4a93bb28890ad086c846d2bf0b35f7f7ae /kernel/power/user.c | |
| parent | TOMOYO: Make several options configurable. (diff) | |
| parent | Merge branch 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| download | linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.tar.xz linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.zip | |
Merge branch 'linus' into next
Diffstat (limited to 'kernel/power/user.c')
| -rw-r--r-- | kernel/power/user.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index 7d02d33be699..42ddbc6f0de6 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -113,8 +113,10 @@ static int snapshot_open(struct inode *inode, struct file *filp) if (error) pm_notifier_call_chain(PM_POST_RESTORE); } - if (error) + if (error) { + free_basic_memory_bitmaps(); atomic_inc(&snapshot_device_available); + } data->frozen = 0; data->ready = 0; data->platform_support = 0; |