diff --git a/[refs] b/[refs]
index 6be619120aea..c0d342f18b97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcbd4ec4c258f88d4cfd3c309c8a56faff061340
+refs/heads/master: 5c339d4541995df2fd3ca31a84c042e7afe9b3c1
diff --git a/trunk/kernel/power/user.c b/trunk/kernel/power/user.c
index 72825c853cd7..93b5dd283dea 100644
--- a/trunk/kernel/power/user.c
+++ b/trunk/kernel/power/user.c
@@ -145,10 +145,10 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
 			error = freeze_processes();
 			if (error) {
 				thaw_processes();
+				enable_nonboot_cpus();
 				error = -EBUSY;
 			}
 		}
-		enable_nonboot_cpus();
 		up(&pm_sem);
 		if (!error)
 			data->frozen = 1;