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

Commit 3c25a75e 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 fixes from Jean Delvare.

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  firmware: dmi_scan: Fix ordering of product_uuid
  firmware: dmi_scan: Simplified displayed version
parents 110bc767 5c1ac56b

drivers/firmware/dmi_scan.c

+6 −6
Original line number Diff line number Diff line
@@ -499,19 +499,19 @@ static int __init dmi_present(const u8 *buf) 
	buf += 16;



	if (memcmp(buf, "_DMI_", 5) == 0 && dmi_checksum(buf, 15)) {

		if (smbios_ver)

			dmi_ver = smbios_ver;

		else

			dmi_ver = (buf[14] & 0xF0) << 4 | (buf[14] & 0x0F);

		dmi_num = get_unaligned_le16(buf + 12);

		dmi_len = get_unaligned_le16(buf + 6);

		dmi_base = get_unaligned_le32(buf + 8);



		if (dmi_walk_early(dmi_decode) == 0) {

			if (smbios_ver) {

				dmi_ver = smbios_ver;

				pr_info("SMBIOS %d.%d%s present.\n",

					dmi_ver >> 8, dmi_ver & 0xFF,

					(dmi_ver < 0x0300) ? "" : ".x");

				pr_info("SMBIOS %d.%d present.\n",

				       dmi_ver >> 8, dmi_ver & 0xFF);

			} else {

				dmi_ver = (buf[14] & 0xF0) << 4 |

					   (buf[14] & 0x0F);

				pr_info("Legacy DMI %d.%d present.\n",

				       dmi_ver >> 8, dmi_ver & 0xFF);

			}