[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: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
acf11faeb1
commit
93c9a7ff50
|
@ -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 {
|
||||||
/* Enter S3, system is already frozen */
|
error = disable_nonboot_cpus();
|
||||||
suspend_enter(PM_SUSPEND_MEM);
|
if (!error) {
|
||||||
|
/* Enter S3, system is already frozen */
|
||||||
|
suspend_enter(PM_SUSPEND_MEM);
|
||||||
|
enable_nonboot_cpus();
|
||||||
|
}
|
||||||
/* Wake up devices */
|
/* Wake up devices */
|
||||||
device_resume();
|
device_resume();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue