diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-13 16:20:07 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-13 16:20:07 +0100 |
commit | 654b0c9627bc1b34cc21643afa8ac359c50db7d7 (patch) | |
tree | f25069e2987e6d61793585adf969f42f9380afcd /kernel/power/user.c | |
parent | d031e1de2c5ba91e67ed83f6adf624543ab2b03d (diff) | |
parent | d020283dc694c9ec31b410f522252f7a8397e67d (diff) | |
download | talos-obmc-linux-654b0c9627bc1b34cc21643afa8ac359c50db7d7.tar.gz talos-obmc-linux-654b0c9627bc1b34cc21643afa8ac359c50db7d7.zip |
Merge commit 'pm-fixes-for-3.3-rc3' into pm-qos
New material in the pm-qos branch depends on recent power management
fixes.
Diffstat (limited to 'kernel/power/user.c')
-rw-r--r-- | kernel/power/user.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index e5a21a857302..3e100075b13c 100644 --- 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; |