Merge ../linus

[pandora-kernel.git] / drivers / char / agp / ati-agp.c

diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 6db9b7f..f244c66 100644 (file)
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -245,23 +245,25 @@ static int ati_configure(void)
 
 
 #ifdef CONFIG_PM
-static int agp_ati_resume(struct pci_dev *dev)
+static int agp_ati_suspend(struct pci_dev *dev, pm_message_t state)
 {
-       pci_restore_state(dev);
+       pci_save_state(dev);
+       pci_set_power_state(dev, 3);
 
-       return ati_configure();
+       return 0;
 }
 
-static int agp_ati_suspend(struct pci_dev *dev, pm_message_t state)
+static int agp_ati_resume(struct pci_dev *dev)
 {
-       pci_save_state(dev);
+       pci_set_power_state(dev, 0);
+       pci_restore_state(dev);
 
-       return 0;
+       return ati_configure();
 }
 #endif
 
 /*
- *Since we don't need contigious memory we just try
+ *Since we don't need contiguous memory we just try
  * to get the gatt table once
  */
 
@@ -545,8 +547,8 @@ static struct pci_driver agp_ati_pci_driver = {
        .probe          = agp_ati_probe,
        .remove         = agp_ati_remove,
 #ifdef CONFIG_PM
-       .resume         = agp_ati_resume,
        .suspend        = agp_ati_suspend,
+       .resume         = agp_ati_resume,
 #endif
 };