firewire: ohci: restore GUID on resume.

Some lousy BIOSes, e.g. my Aspire 5720 BIOS forget to restore the GUID
register on resume from RAM.

Fix that by setting it to the last value that was read from it.

Signed-off-by: Maxim Levitsky <[email protected]>
Signed-off-by: Stefan Richter <[email protected]>

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index eb7b591e1c1b5813346f565b8fc9452c7015a0db..3a908038ff6243fa39938c1ed8c01271c47fac27 100644 (file)
--- 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