diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-17 20:46:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-17 20:46:22 +0200 |
| commit | 86460103c412f9e11aeb7950cce64b9e51539d4d (patch) | |
| tree | 9d6230418012a22e0b1d4d09b024e24377002a6c /kernel | |
| parent | reiserfs: fixup perms when xattrs are disabled (diff) | |
| parent | PM: check sysdev_suspend(PMSG_FREEZE) return value (diff) | |
| download | linux-86460103c412f9e11aeb7950cce64b9e51539d4d.tar.xz linux-86460103c412f9e11aeb7950cce64b9e51539d4d.zip | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/disk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index e71ca9cd81b2..b0dc9e7a0d17 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -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; } |