diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/apm_32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index bf9290e29013..c1735f61a2c0 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -1211,9 +1211,9 @@ static int suspend(int vetoable) | |||
1211 | if (err != APM_SUCCESS) | 1211 | if (err != APM_SUCCESS) |
1212 | apm_error("suspend", err); | 1212 | apm_error("suspend", err); |
1213 | err = (err == APM_SUCCESS) ? 0 : -EIO; | 1213 | err = (err == APM_SUCCESS) ? 0 : -EIO; |
1214 | device_power_up(); | 1214 | device_power_up(PMSG_RESUME); |
1215 | local_irq_enable(); | 1215 | local_irq_enable(); |
1216 | device_resume(); | 1216 | device_resume(PMSG_RESUME); |
1217 | queue_event(APM_NORMAL_RESUME, NULL); | 1217 | queue_event(APM_NORMAL_RESUME, NULL); |
1218 | spin_lock(&user_list_lock); | 1218 | spin_lock(&user_list_lock); |
1219 | for (as = user_list; as != NULL; as = as->next) { | 1219 | for (as = user_list; as != NULL; as = as->next) { |
@@ -1238,7 +1238,7 @@ static void standby(void) | |||
1238 | apm_error("standby", err); | 1238 | apm_error("standby", err); |
1239 | 1239 | ||
1240 | local_irq_disable(); | 1240 | local_irq_disable(); |
1241 | device_power_up(); | 1241 | device_power_up(PMSG_RESUME); |
1242 | local_irq_enable(); | 1242 | local_irq_enable(); |
1243 | } | 1243 | } |
1244 | 1244 | ||
@@ -1324,7 +1324,7 @@ static void check_events(void) | |||
1324 | ignore_bounce = 1; | 1324 | ignore_bounce = 1; |
1325 | if ((event != APM_NORMAL_RESUME) | 1325 | if ((event != APM_NORMAL_RESUME) |
1326 | || (ignore_normal_resume == 0)) { | 1326 | || (ignore_normal_resume == 0)) { |
1327 | device_resume(); | 1327 | device_resume(PMSG_RESUME); |
1328 | queue_event(event, NULL); | 1328 | queue_event(event, NULL); |
1329 | } | 1329 | } |
1330 | ignore_normal_resume = 0; | 1330 | ignore_normal_resume = 0; |