Pārlūkot izejas kodu

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 <maximlevitsky@gmail.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Maxim Levitsky 14 gadi atpakaļ
vecāks
revīzija
8662b6b029
1 mainītis faili ar 7 papildinājumiem un 0 dzēšanām
  1. 7 0
      drivers/firewire/ohci.c

+ 7 - 0
drivers/firewire/ohci.c

@@ -3284,6 +3284,13 @@ static int pci_resume(struct pci_dev *dev)
 		return err;
 		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);
 	return ohci_enable(&ohci->card, NULL, 0);
 }
 }
 #endif
 #endif