diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:07:40 -0400 | 
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:07:40 -0400 | 
| commit | ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf (patch) | |
| tree | 963cdd52a4032cd4827896c4e813cfbf6dd7b3e6 /kernel/power/main.c | |
| parent | 43f66a6ce8da299344cf1bc2ac2311889cc88555 (diff) | |
| parent | 1f15d694522af9cd7492695f11dd2dc77b6cf098 (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch we18
Diffstat (limited to 'kernel/power/main.c')
| -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); | 
