Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8662b6b0 authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Stefan Richter
Browse files

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: default avatarMaxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent ec766a79

drivers/firewire/ohci.c

+7 −0
Original line number Diff line number Diff line
@@ -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