diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-24 19:38:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-24 19:38:25 -0700 |
| commit | 93c32483808c5d82c9bd1eef2208854a6d1326db (patch) | |
| tree | fd8190ca7ce4b210f4e9fff135041f5c02456682 /kernel/power/main.c | |
| parent | d5a877e8dd409d8c702986d06485c374b705d340 (diff) | |
| parent | 32bdfac5462d777f35b00838893c4f87baf23efe (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: Do not hold dpm_list_mtx while disabling/enabling nonboot CPUs
Diffstat (limited to 'kernel/power/main.c')
| -rw-r--r-- | kernel/power/main.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index f99ed6a75ea..868028280d1 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -289,12 +289,10 @@ static int suspend_enter(suspend_state_t state) { int error; - device_pm_lock(); - if (suspend_ops->prepare) { error = suspend_ops->prepare(); if (error) - goto Done; + return error; } error = device_power_down(PMSG_SUSPEND); @@ -343,9 +341,6 @@ static int suspend_enter(suspend_state_t state) if (suspend_ops->finish) suspend_ops->finish(); - Done: - device_pm_unlock(); - return error; } |