Commit e78bf8cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

Pull dmi update from Jean Delvare.

Tiny cleanup.

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  firmware: dmi: Use the proper accessor for the version field
parents c40e8341 d2139dfc

drivers/firmware/dmi_scan.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static int __init dmi_smbios3_present(const u8 *buf) 
{

	if (memcmp(buf, "_SM3_", 5) == 0 &&

	    buf[6] < 32 && dmi_checksum(buf, buf[6])) {

		dmi_ver = get_unaligned_be32(buf + 6) & 0xFFFFFF;

		dmi_ver = get_unaligned_be24(buf + 7);

		dmi_num = 0;			/* No longer specified */

		dmi_len = get_unaligned_le32(buf + 12);

		dmi_base = get_unaligned_le64(buf + 16);