Merge commit 'v2.6.31-rc8' into next

2009-08-27 22:00:20 -07:00
parent 805423e84e 326ba5010a
commit 4b61bb575b
1284 changed files with 32589 additions and 18887 deletions
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -508,7 +508,7 @@ static int pci_restore_standard_config(struct pci_dev *pci_dev)
 			return error;
 	}

-	return pci_dev->state_saved ? pci_restore_state(pci_dev) : 0;
+	return pci_restore_state(pci_dev);
 }

 static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev)