aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/regd.c
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/regd.c
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/regd.c')
-rw-r--r--drivers/net/wireless/ath/regd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index 4b5c851b81ff..526c7f1308db 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -477,7 +477,7 @@ ath_regd_init(struct ath_regulatory *reg,
477 u16 regdmn; 477 u16 regdmn;
478 478
479 if (!ath_regd_is_eeprom_valid(reg)) { 479 if (!ath_regd_is_eeprom_valid(reg)) {
480 printk(KERN_DEBUG "ath: Invalid EEPROM contents\n"); 480 printk(KERN_ERR "ath: Invalid EEPROM contents\n");
481 return -EINVAL; 481 return -EINVAL;
482 } 482 }
483 483