Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 327959
b: refs/heads/master
c: 77c8a14
h: refs/heads/master
i:
  327957: 751a671
  327955: fd89304
  327951: 9fde0e9
v: v3
  • Loading branch information
Bing Zhao authored and John W. Linville committed Sep 11, 2012
1 parent 99c700a commit bc93529
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e89e2da29b7e2cba217a3e91a3106b708d0b878d
refs/heads/master: 77c8a14b1f04b823388700195c547fdb6b625d49
5 changes: 3 additions & 2 deletions trunk/drivers/net/wireless/mwifiex/cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -1862,8 +1862,9 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
return ret;
}
country_code = mwifiex_11d_code_2_region(priv->adapter->region_code);
if (country_code && regulatory_hint(wiphy, country_code))
dev_err(adapter->dev, "regulatory_hint() failed\n");
if (country_code)
dev_info(adapter->dev,
"ignoring F/W country code %2.2s\n", country_code);

adapter->wiphy = wiphy;
return ret;
Expand Down

0 comments on commit bc93529

Please sign in to comment.