From 1abc1bb324bcacc2b55c815944b81e2aece07898 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Wed, 11 Apr 2012 11:52:49 +0200
Subject: [PATCH] --- yaml --- r: 300959 b: refs/heads/master c:
 6b8da423315b5ea7573c8c3a3925941b9a1c3932 h: refs/heads/master i:   300957:
 38c5c267c4d529d1c512b0c31b15b4ba50dca717   300955:
 5dbc67de38a6ecfb9e5b1373b02c9290f6897b0b   300951:
 2903dbeb711cbadb2a10e91bfd3d5ed4e7cd324e   300943:
 1ad7bba69d4ca6201ffd17e66f7d9abc9055d846   300927:
 4996065920e980383a6c8f83ee460eb51083a1b8 v: v3

---
 [refs]                                                      | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 109dc9d379e6..2396207f00b6 100644
--- 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
index 569ab8abd2a1..aa15558f75c8 100644
--- 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);