diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 12:35:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 12:35:22 -0400 |
| commit | ed7ba2ef09254b2fd9698708b407f4652d26e36a (patch) | |
| tree | d16ea988b54d906704003ab086498c184afe1a1f /drivers/base | |
| parent | 4b99d3527041bec1abe9903263a3a1b7d2ba0c4a (diff) | |
| parent | 886a7a3371da8ee46a13f8e598a536bd8765b837 (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: Clear -EAGAIN in dpm_prepare
x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index fae725458981..58a3e572f2c9 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
| @@ -762,6 +762,7 @@ static int dpm_prepare(pm_message_t state) | |||
| 762 | dev->power.status = DPM_ON; | 762 | dev->power.status = DPM_ON; |
| 763 | if (error == -EAGAIN) { | 763 | if (error == -EAGAIN) { |
| 764 | put_device(dev); | 764 | put_device(dev); |
| 765 | error = 0; | ||
| 765 | continue; | 766 | continue; |
| 766 | } | 767 | } |
| 767 | printk(KERN_ERR "PM: Failed to prepare device %s " | 768 | printk(KERN_ERR "PM: Failed to prepare device %s " |