1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index eb7b591e1c1b..3a908038ff62 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -3284,6 +3284,13 @@ static int pci_resume(struct pci_dev *dev)
                 return err;
         }
 
+        /* Some systems don't setup GUID register on resume from ram  */
+        if (!reg_read(ohci, OHCI1394_GUIDLo) &&
+                                        !reg_read(ohci, OHCI1394_GUIDHi)) {
+                reg_write(ohci, OHCI1394_GUIDLo, (u32)ohci->card.guid);
+                reg_write(ohci, OHCI1394_GUIDHi, (u32)(ohci->card.guid >> 32));
+        }
+
         return ohci_enable(&ohci->card, NULL, 0);
 }
 #endif