summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-06-24 16:28:31 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-06-24 16:28:31 +0900
commitfacbdce9a2a68098eabb06671c3b9d9b992bad60 (patch)
tree75355e429fc01c8bf246b1f44a081054293d7e37 /kernel
parentf448e9c9dad6fb919ec74cd1b2c189efe952886f (diff)
parent794d78fea51504bad3880d14f354a9847f318f25 (diff)
Merge branch 'sh/clkfwk' into sh-latest
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/user.c4
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;