diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-17 14:46:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-17 14:46:22 -0400 |
| commit | 86460103c412f9e11aeb7950cce64b9e51539d4d (patch) | |
| tree | 9d6230418012a22e0b1d4d09b024e24377002a6c /kernel | |
| parent | b83674c0da6558e357c6b482ccf299eeea77d8ef (diff) | |
| parent | 4484079d517c2b6521621be0b1ea246ccc55c7d7 (diff) | |
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) | |||
| 241 | 241 | ||
| 242 | local_irq_disable(); | 242 | local_irq_disable(); |
| 243 | 243 | ||
| 244 | sysdev_suspend(PMSG_FREEZE); | 244 | error = sysdev_suspend(PMSG_FREEZE); |
| 245 | if (error) { | 245 | if (error) { |
| 246 | printk(KERN_ERR "PM: Some devices failed to power down, " | 246 | printk(KERN_ERR "PM: Some system devices failed to power down, " |
| 247 | "aborting hibernation\n"); | 247 | "aborting hibernation\n"); |
| 248 | goto Enable_irqs; | 248 | goto Enable_irqs; |
| 249 | } | 249 | } |