This reverts commit 712ff25450bd01366301eef81c33e865d901e7b7.

The output of dmi_save_uuid() is exposed to user space as
/sys/devices/virtual/dmi/id/*_uuid, so this breaks backwards compatibility,
E.G.  I have systems that include the content of dmi/id/product_uuid as part
of the keyphrase for cryptsetup luksOpen.

As the change was purely cosmetical, revert it to fix such breakage.

Signed-off-by: Peter Korsgaard <[email protected]>
---
 drivers/firmware/dmi_scan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 099d83e4e910..2ed51651565f 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -211,9 +211,9 @@ static void __init dmi_save_uuid(const struct dmi_header 
*dm, int slot,
         * says that this is the defacto standard.
         */
        if (dmi_ver >= 0x020600)
-               sprintf(s, "%pUl", d);
+               sprintf(s, "%pUL", d);
        else
-               sprintf(s, "%pUb", d);
+               sprintf(s, "%pUB", d);
 
        dmi_ident[slot] = s;
 }
-- 
2.11.0

Reply via email to