---

yaml --- r: 236215 b: refs/heads/master c: e343d3e h: refs/heads/master i: 236213: ab6cc62 236211: 9e9c6ed 236207: 2ca254a v: v3
git-mirror · Mar 2, 2011 · 068ffcb · 068ffcb
1 parent c39f64c
commit 068ffcb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git 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
@@ -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 */