Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/pci/pci.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff -puN drivers/pci/pci.c~gregkh-pci-pci-reverse-pci-config-space-restore-order drivers/pci/pci.c
--- devel/drivers/pci/pci.c~gregkh-pci-pci-reverse-pci-config-space-restore-order	2006-06-09 15:17:22.000000000 -0700
+++ devel-akpm/drivers/pci/pci.c	2006-06-09 15:17:22.000000000 -0700
@@ -462,7 +462,11 @@ pci_restore_state(struct pci_dev *dev)
 	int i;
 	int val;
 
-	for (i = 0; i < 16; i++) {
+	/*
+	 * The Base Address register should be programmed before the command
+	 * register(s)
+	 */
+	for (i = 15; i >= 0; i--) {
 		pci_read_config_dword(dev, i * 4, &val);
 		if (val != dev->saved_config_space[i]) {
 			printk(KERN_DEBUG "PM: Writing back config space on "
_