diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index d2520451f36b..12286275b1c8 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -463,7 +463,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 "