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

 drivers/pci/pci.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff -puN drivers/pci/pci.c~gregkh-pci-pci-improve-pci-config-space-writeback drivers/pci/pci.c
--- devel/drivers/pci/pci.c~gregkh-pci-pci-improve-pci-config-space-writeback	2006-06-09 15:21:26.000000000 -0700
+++ devel-akpm/drivers/pci/pci.c	2006-06-09 15:21:26.000000000 -0700
@@ -460,9 +460,19 @@ int 
 pci_restore_state(struct pci_dev *dev)
 {
 	int i;
+	int val;
 
-	for (i = 0; i < 16; i++)
-		pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]);
+	for (i = 0; i < 16; 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 "
+				"device %s at offset %x (was %x, writing %x)\n",
+				pci_name(dev), i,
+				val, (int)dev->saved_config_space[i]);
+			pci_write_config_dword(dev,i * 4,
+				dev->saved_config_space[i]);
+		}
+	}
 	pci_restore_msi_state(dev);
 	pci_restore_msix_state(dev);
 	return 0;
_