Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[profile/ivi/kernel-adaptation-intel-automotive.git] / kernel / power / user.c

diff --git a/kernel/power/user.c b/kernel/power/user.c
index dd09efe..d6a8dcc 100644 (file)
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -398,9 +398,10 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
 
                case PMOPS_ENTER:
                        if (data->platform_suspend) {
+                               disable_nonboot_cpus();
                                kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
                                error = pm_ops->enter(PM_SUSPEND_DISK);
-                               error = 0;
+                               enable_nonboot_cpus();
                        }
                        break;