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

Commit f1e91324 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 fix from Jean Delvare.

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  firmware: dmi_scan: Always show system identification string
parents ac5a28b0 d4af49f8

drivers/firmware/dmi_scan.c

+2 −2
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ static int __init dmi_present(const u8 *buf) 
					dmi_ver >> 16, (dmi_ver >> 8) & 0xFF);

			}

			dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));

			printk(KERN_DEBUG "DMI: %s\n", dmi_ids_string);

			pr_info("DMI: %s\n", dmi_ids_string);

			return 0;

		}

	}
@@ -588,7 +588,7 @@ static int __init dmi_smbios3_present(const u8 *buf) 
				dmi_ver >> 16, (dmi_ver >> 8) & 0xFF,

				dmi_ver & 0xFF);

			dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));

			pr_debug("DMI: %s\n", dmi_ids_string);

			pr_info("DMI: %s\n", dmi_ids_string);

			return 0;

		}

	}