Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 13 insertions, 8 deletions

diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 938100f14b16..d46467271349 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -5,7 +5,6 @@
 #include <linux/dmi.h>
 #include <linux/efi.h>
 #include <linux/bootmem.h>
-#include <linux/slab.h>
 #include <asm/dmi.h>
 
 /*
@@ -169,10 +168,7 @@ static void __init dmi_save_uuid(const struct dmi_header *dm, int slot, int inde
         if (!s)
                 return;
 
-        sprintf(s,
-                "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X",
-                d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7],
-                d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]);
+        sprintf(s, "%pUB", d);
 
         dmi_ident[slot] = s;
 }
@@ -429,7 +425,7 @@ static bool dmi_matches(const struct dmi_system_id *dmi)
         for (i = 0; i < ARRAY_SIZE(dmi->matches); i++) {
                 int s = dmi->matches[i].slot;
                 if (s == DMI_NONE)
-                        continue;
+                        break;
                 if (dmi_ident[s]
                     && strstr(dmi_ident[s], dmi->matches[i].substr))
                         continue;
@@ -440,6 +436,15 @@ static bool dmi_matches(const struct dmi_system_id *dmi)
 }
 
 /**
+ *      dmi_is_end_of_table - check for end-of-table marker
+ *      @dmi: pointer to the dmi_system_id structure to check
+ */
+static bool dmi_is_end_of_table(const struct dmi_system_id *dmi)
+{
+        return dmi->matches[0].slot == DMI_NONE;
+}
+
+/**
  *      dmi_check_system - check system DMI data
  *      @list: array of dmi_system_id structures to match against
  *              All non-null elements of the list must match
@@ -457,7 +462,7 @@ int dmi_check_system(const struct dmi_system_id *list)
         int count = 0;
         const struct dmi_system_id *d;
 
-        for (d = list; d->ident; d++)
+        for (d = list; !dmi_is_end_of_table(d); d++)
                 if (dmi_matches(d)) {
                         count++;
                         if (d->callback && d->callback(d))
@@ -484,7 +489,7 @@ const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list)
 {
         const struct dmi_system_id *d;
 
-        for (d = list; d->ident; d++)
+        for (d = list; !dmi_is_end_of_table(d); d++)
                 if (dmi_matches(d))
                         return d;