From 068ffcb76e73fbcc28a397fa8083bc001b607ce2 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Wed, 2 Mar 2011 17:01:37 +0100
Subject: [PATCH] --- yaml --- r: 236215 b: refs/heads/master c:
 e343d3ea73e97b339ecb1d39f1cdd306da24a175 h: refs/heads/master i:   236213:
 ab6cc62f5a4cf1d1410f5abf0f1cd98b98f68b66   236211:
 9e9c6ed3a97f0b1f4875a8a0cbea1118cb8ea81a   236207:
 2ca254ab037c4527f357ee220524bcfa6acf6c5f v: v3

---
 [refs]                                        |  2 +-
 .../staging/brcm80211/brcmsmac/wl_mac80211.c  | 28 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index c2d990fe1621..132add301e05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ae92624969bdee951b64f638898ac9f96646558
+refs/heads/master: e343d3ea73e97b339ecb1d39f1cdd306da24a175
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 6059e4cc3aa1..6ce5172557f6 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -1293,18 +1293,22 @@ static int __init wl_module_init(void)
 		wl_msg_level = msglevel;
 	else {
 		char *var = getvar(NULL, "wl_msglevel");
-		if (var)
-			wl_msg_level = simple_strtoul(var, NULL, 0);
-	}
-	{
-		extern u32 phyhal_msg_level;
-
-		if (phymsglevel != 0xdeadbeef)
-			phyhal_msg_level = phymsglevel;
-		else {
-			char *var = getvar(NULL, "phy_msglevel");
-			if (var)
-				phyhal_msg_level = simple_strtoul(var, NULL, 0);
+		if (var) {
+			unsigned long value;
+
+			(void)strict_strtoul(var, 0, &value);
+			wl_msg_level = value;
+		}
+	}
+	if (phymsglevel != 0xdeadbeef)
+		phyhal_msg_level = phymsglevel;
+	else {
+		char *var = getvar(NULL, "phy_msglevel");
+		if (var) {
+			unsigned long value;
+
+			(void)strict_strtoul(var, 0, &value);
+			phyhal_msg_level = value;
 		}
 	}
 #endif				/* BCMDBG */