Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-fixes...

[mv-sheeva.git] / kernel / power / user.c

diff --git a/kernel/power/user.c b/kernel/power/user.c
index e5a21a857302e5e596e54eb3f8f6a00e8a342cae..3e100075b13cb6ab449034af458266e20dcaa369 100644 (file)
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -249,13 +249,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
                }
                pm_restore_gfp_mask();
                error = hibernation_snapshot(data->platform_support);
-               if (!error) {
+               if (error) {
+                       thaw_kernel_threads();
+               } else {
                        error = put_user(in_suspend, (int __user *)arg);
                        if (!error && !freezer_test_done)
                                data->ready = 1;
                        if (freezer_test_done) {
                                freezer_test_done = false;
-                               thaw_processes();
+                               thaw_kernel_threads();
                        }
                }
                break;