Commit 93c9a7ff authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds

[PATCH] swsusp: Fix SNAPSHOT_S2RAM ioctl

The SNAPSHOT_S2RAM ioctl does not disable the nonboot CPUs before entering
the suspend, although it should do this.
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent acf11fae
...@@ -368,9 +368,12 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp, ...@@ -368,9 +368,12 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
if (error) { if (error) {
printk(KERN_ERR "Failed to suspend some devices.\n"); printk(KERN_ERR "Failed to suspend some devices.\n");
} else { } else {
error = disable_nonboot_cpus();
if (!error) {
/* Enter S3, system is already frozen */ /* Enter S3, system is already frozen */
suspend_enter(PM_SUSPEND_MEM); suspend_enter(PM_SUSPEND_MEM);
enable_nonboot_cpus();
}
/* Wake up devices */ /* Wake up devices */
device_resume(); device_resume();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment