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

1 files changed, 20 insertions, 11 deletions

diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c
index 8943015a3eef..f2f920fef10d 100644
--- a/drivers/ssb/sprom.c
+++ b/drivers/ssb/sprom.c
@@ -13,6 +13,9 @@
 
 #include "ssb_private.h"
 
+#include <linux/ctype.h>
+#include <linux/slab.h>
+
 
 static const struct ssb_sprom *fallback_sprom;
 
@@ -33,17 +36,27 @@ static int sprom2hex(const u16 *sprom, char *buf, size_t buf_len,
 static int hex2sprom(u16 *sprom, const char *dump, size_t len,
                      size_t sprom_size_words)
 {
-        char tmp[5] = { 0 };
-        int cnt = 0;
+        char c, tmp[5] = { 0 };
+        int err, cnt = 0;
         unsigned long parsed;
 
-        if (len < sprom_size_words * 2)
+        /* Strip whitespace at the end. */
+        while (len) {
+                c = dump[len - 1];
+                if (!isspace(c) && c != '\0')
+                        break;
+                len--;
+        }
+        /* Length must match exactly. */
+        if (len != sprom_size_words * 4)
                 return -EINVAL;
 
         while (cnt < sprom_size_words) {
                 memcpy(tmp, dump, 4);
                 dump += 4;
-                parsed = simple_strtoul(tmp, NULL, 16);
+                err = strict_strtoul(tmp, 16, &parsed);
+                if (err)
+                        return err;
                 sprom[cnt++] = swab16((u16)parsed);
         }
 
@@ -90,6 +103,7 @@ ssize_t ssb_attr_sprom_store(struct ssb_bus *bus,
         u16 *sprom;
         int res = 0, err = -ENOMEM;
         size_t sprom_size_words = bus->sprom_size;
+        struct ssb_freeze_context freeze;
 
         sprom = kcalloc(bus->sprom_size, sizeof(u16), GFP_KERNEL);
         if (!sprom)
@@ -111,18 +125,13 @@ ssize_t ssb_attr_sprom_store(struct ssb_bus *bus,
         err = -ERESTARTSYS;
         if (mutex_lock_interruptible(&bus->sprom_mutex))
                 goto out_kfree;
-        err = ssb_devices_freeze(bus);
-        if (err == -EOPNOTSUPP) {
-                ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze devices. "
-                           "No suspend support. Is CONFIG_PM enabled?\n");
-                goto out_unlock;
-        }
+        err = ssb_devices_freeze(bus, &freeze);
         if (err) {
                 ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
                 goto out_unlock;
         }
         res = sprom_write(bus, sprom);
-        err = ssb_devices_thaw(bus);
+        err = ssb_devices_thaw(&freeze);
         if (err)
                 ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
 out_unlock: