]> git.hungrycats.org Git - linux/commitdiff
[apm] Fix calls to device_{suspend,resume}
authorPatrick Mochel <mochel@osdl.org>
Thu, 21 Aug 2003 07:15:20 +0000 (00:15 -0700)
committerPatrick Mochel <mochel@osdl.org>
Thu, 21 Aug 2003 07:15:20 +0000 (00:15 -0700)
arch/i386/kernel/apm.c

index b534bd53bc67e3f9ceb39ab5a106caa35191b4ba..94ff91ebe2e0e56901322f50bbd10290fdd41c4f 100644 (file)
@@ -1198,7 +1198,7 @@ static int suspend(int vetoable)
                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 */
        write_seqlock_irq(&xtime_lock);
@@ -1232,7 +1232,7 @@ static int suspend(int vetoable)
        if (err != APM_SUCCESS)
                apm_error("suspend", err);
        err = (err == APM_SUCCESS) ? 0 : -EIO;
-       device_resume(RESUME_POWER_ON);
+       device_resume();
        pm_send_all(PM_RESUME, (void *)0);
        queue_event(APM_NORMAL_RESUME, NULL);
  out:
@@ -1346,7 +1346,7 @@ static void check_events(void)
                                write_seqlock_irq(&xtime_lock);
                                set_time();
                                write_sequnlock_irq(&xtime_lock);
-                               device_resume(RESUME_POWER_ON);
+                               device_resume();
                                pm_send_all(PM_RESUME, (void *)0);
                                queue_event(event, NULL);
                        }