Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull dmi fix from Jean Delvare.
* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
firmware: dmi_scan: Fix UUID endianness for SMBIOS >= 2.6
+3
-3
+3
-3
drivers/firmware/dmi_scan.c
+3
-3
drivers/firmware/dmi_scan.c
···
521
521
dmi_ver = smbios_ver;
522
522
else
523
523
dmi_ver = (buf[14] & 0xF0) << 4 | (buf[14] & 0x0F);
524
+
dmi_ver <<= 8;
524
525
dmi_num = get_unaligned_le16(buf + 12);
525
526
dmi_len = get_unaligned_le16(buf + 6);
526
527
dmi_base = get_unaligned_le32(buf + 8);
···
529
528
if (dmi_walk_early(dmi_decode) == 0) {
530
529
if (smbios_ver) {
531
530
pr_info("SMBIOS %d.%d present.\n",
532
-
dmi_ver >> 8, dmi_ver & 0xFF);
531
+
dmi_ver >> 16, (dmi_ver >> 8) & 0xFF);
533
532
} else {
534
533
smbios_entry_point_size = 15;
535
534
memcpy(smbios_entry_point, buf,
536
535
smbios_entry_point_size);
537
536
pr_info("Legacy DMI %d.%d present.\n",
538
-
dmi_ver >> 8, dmi_ver & 0xFF);
537
+
dmi_ver >> 16, (dmi_ver >> 8) & 0xFF);
539
538
}
540
-
dmi_ver <<= 8;
541
539
dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));
542
540
printk(KERN_DEBUG "DMI: %s\n", dmi_ids_string);
543
541
return 0;