diff --git a/[refs] b/[refs]
index b22504aee834..ab10ecd29eaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fb40eb883ad2d22ad6975b4323cb76e018fa280
+refs/heads/master: 821b537fd7bf9018f1df4b882cea199613147f65
diff --git a/trunk/arch/powerpc/platforms/pseries/eeh_cache.c b/trunk/arch/powerpc/platforms/pseries/eeh_cache.c
index 9fe2a7de04c0..ff6c938f424b 100644
--- a/trunk/arch/powerpc/platforms/pseries/eeh_cache.c
+++ b/trunk/arch/powerpc/platforms/pseries/eeh_cache.c
@@ -307,6 +307,9 @@ void __init pci_addr_cache_build(void)
 		/* Save the BAR's; firmware doesn't restore these after EEH reset */
 		dn = pci_device_to_OF_node(dev);
 		eeh_save_bars(dev, PCI_DN(dn));
+
+		pci_dev_get (dev);  /* matching put is in eeh_remove_device() */
+		PCI_DN(dn)->pcidev = dev;
 	}
 
 #ifdef DEBUG