---

yaml --- r: 300959 b: refs/heads/master c: 6b8da42 h: refs/heads/master i: 300957: 38c5c26 300955: 5dbc67d 300951: 2903dbe 300943: 1ad7bba 300927: 4996065 v: v3
git-mirror · Apr 13, 2012 · 1abc1bb · 1abc1bb
1 parent 69a5404
commit 1abc1bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1225705a4ca940b50eef146d2810b2d5cd189cc7
+refs/heads/master: 6b8da423315b5ea7573c8c3a3925941b9a1c3932
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -1069,11 +1069,7 @@ static struct brcms_info *brcms_attach(struct bcma_device *pdev)
 		wiphy_err(wl->wiphy, "%s: ieee80211_register_hw failed, status"
 			  "%d\n", __func__, err);
 
-	if (wl->pub->srom_ccode[0])
-		err = brcms_set_hint(wl, wl->pub->srom_ccode);
-	else
-		err = brcms_set_hint(wl, "US");
-	if (err)
+	if (wl->pub->srom_ccode[0] && brcms_set_hint(wl, wl->pub->srom_ccode))
 		wiphy_err(wl->wiphy, "%s: regulatory_hint failed, status %d\n",
 			  __func__, err);