Commit 7a399df6 authored by Patrick Mochel's avatar Patrick Mochel

[apm] Fix calls to device_{suspend,resume}

parent ab207bea
...@@ -1198,7 +1198,7 @@ static int suspend(int vetoable) ...@@ -1198,7 +1198,7 @@ static int suspend(int vetoable)
printk(KERN_CRIT "apm: suspend was vetoed, but suspending anyway.\n"); printk(KERN_CRIT "apm: suspend was vetoed, but suspending anyway.\n");
} }
device_suspend(3, SUSPEND_POWER_DOWN); device_suspend(3);
/* serialize with the timer interrupt */ /* serialize with the timer interrupt */
write_seqlock_irq(&xtime_lock); write_seqlock_irq(&xtime_lock);
...@@ -1232,7 +1232,7 @@ static int suspend(int vetoable) ...@@ -1232,7 +1232,7 @@ static int suspend(int vetoable)
if (err != APM_SUCCESS) if (err != APM_SUCCESS)
apm_error("suspend", err); apm_error("suspend", err);
err = (err == APM_SUCCESS) ? 0 : -EIO; err = (err == APM_SUCCESS) ? 0 : -EIO;
device_resume(RESUME_POWER_ON); device_resume();
pm_send_all(PM_RESUME, (void *)0); pm_send_all(PM_RESUME, (void *)0);
queue_event(APM_NORMAL_RESUME, NULL); queue_event(APM_NORMAL_RESUME, NULL);
out: out:
...@@ -1346,7 +1346,7 @@ static void check_events(void) ...@@ -1346,7 +1346,7 @@ static void check_events(void)
write_seqlock_irq(&xtime_lock); write_seqlock_irq(&xtime_lock);
set_time(); set_time();
write_sequnlock_irq(&xtime_lock); write_sequnlock_irq(&xtime_lock);
device_resume(RESUME_POWER_ON); device_resume();
pm_send_all(PM_RESUME, (void *)0); pm_send_all(PM_RESUME, (void *)0);
queue_event(event, NULL); queue_event(event, NULL);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment