aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ar9170
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-04-13 21:41:46 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-04-22 16:57:15 -0400
commit85efc86eb7c6cbb1c8ce8d99b10b948be033fbb9 (patch)
tree273ad6d462c816057a4f791f12febad5cce5e962 /drivers/net/wireless/ath/ar9170
parent26925042b6b105995ee54c6015e95f0caf9632d6 (diff)
atheros: fix propagation of bad EEPROM on regulatory init
When the EEPROM is not in good condition we cannot continue so we currently bail out but only ath5k is bailing out properly. Both ath9k and ar9170 were proceeding and if a user were to run into this they'd see an obscure panic. Lets propagate the error as intended and make sure we inform the user by lifting the error message from debug to a kernel error. Stable note: You can find a port of this page here: http://bombadil.infradead.org/~mcgrof/patches/ath9k/ath9k-fix-eeprom.patch.txt Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ar9170')
-rw-r--r--drivers/net/wireless/ath/ar9170/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
index 8de0ff9f580b..857416c80199 100644
--- a/drivers/net/wireless/ath/ar9170/main.c
+++ b/drivers/net/wireless/ath/ar9170/main.c
@@ -1649,6 +1649,8 @@ int ar9170_register(struct ar9170 *ar, struct device *pdev)
1649 1649
1650 err = ath_regd_init(&ar->regulatory, ar->hw->wiphy, 1650 err = ath_regd_init(&ar->regulatory, ar->hw->wiphy,
1651 ar9170_reg_notifier); 1651 ar9170_reg_notifier);
1652 if (err)
1653 goto err_out;
1652 1654
1653 err = ieee80211_register_hw(ar->hw); 1655 err = ieee80211_register_hw(ar->hw);
1654 if (err) 1656 if (err)