Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM: check sysdev_suspend(PMSG_FREEZE) return value
This commit is contained in:
Linus Torvalds 2009-05-17 11:46:22 -07:00
commit 86460103c4

View file

@ -241,9 +241,9 @@ static int create_image(int platform_mode)
local_irq_disable(); local_irq_disable();
sysdev_suspend(PMSG_FREEZE); error = sysdev_suspend(PMSG_FREEZE);
if (error) { if (error) {
printk(KERN_ERR "PM: Some devices failed to power down, " printk(KERN_ERR "PM: Some system devices failed to power down, "
"aborting hibernation\n"); "aborting hibernation\n");
goto Enable_irqs; goto Enable_irqs;
} }