diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-18 19:37:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-18 19:37:46 -0400 |
| commit | 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 (patch) | |
| tree | 46ae0ec07caf01fa5c743112ae8ee932d1e66854 /kernel | |
| parent | 301216244b1e39c4346e56d38b079ca53d528580 (diff) | |
| parent | 0b405a0f7e4d4d18fd1fe46ddf5ff465443036ab (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 7960ddf04a57..4cdebc972ff2 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
| @@ -156,14 +156,14 @@ static int enter_state(suspend_state_t state) | |||
| 156 | goto Unlock; | 156 | goto Unlock; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | pr_debug("PM: Preparing system for suspend\n"); | 159 | pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]); |
| 160 | if ((error = suspend_prepare(state))) | 160 | if ((error = suspend_prepare(state))) |
| 161 | goto Unlock; | 161 | goto Unlock; |
| 162 | 162 | ||
| 163 | pr_debug("PM: Entering state.\n"); | 163 | pr_debug("PM: Entering %s sleep\n", pm_states[state]); |
| 164 | error = suspend_enter(state); | 164 | error = suspend_enter(state); |
| 165 | 165 | ||
| 166 | pr_debug("PM: Finishing up.\n"); | 166 | pr_debug("PM: Finishing wakeup.\n"); |
| 167 | suspend_finish(state); | 167 | suspend_finish(state); |
| 168 | Unlock: | 168 | Unlock: |
| 169 | up(&pm_sem); | 169 | up(&pm_sem); |