Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed May 17, 2009
2 parents b83674c + 4484079 commit 8646010
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions kernel/power/disk.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ static int create_image(int platform_mode)

local_irq_disable();

sysdev_suspend(PMSG_FREEZE);
error = sysdev_suspend(PMSG_FREEZE);
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");
goto Enable_irqs;
}
Expand Down

0 comments on commit 8646010

Please sign in to comment.