mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-14 20:46:39 +00:00
Code Issues Releases Wiki Activity

atheros: fix propagation of bad EEPROM on regulatory init

Browse source 
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>
This commit is contained in:
Luis R. Rodriguez 2009-04-13 21:41:46 -04:00 committed by John W. Linville
parent 26925042b6
commit 85efc86eb7
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/ath/ar9170/main.c
View file

@ -1649,6 +1649,8 @@ int ar9170_register(struct ar9170 *ar, struct device *pdev)
err = ath_regd_init(&ar->regulatory, ar->hw->wiphy,
ar9170_reg_notifier);
if (err)
goto err_out;
err = ieee80211_register_hw(ar->hw);
if (err)

5
drivers/net/wireless/ath/ath9k/main.c
View file

@ -1416,8 +1416,9 @@ static int ath_init(u16 devid, struct ath_softc *sc)
for (i = 0; i < sc->keymax; i++)
ath9k_hw_keyreset(ah, (u16) i);
if (ath_regd_init(&sc->sc_ah->regulatory, sc->hw->wiphy,
ath9k_reg_notifier))
error = ath_regd_init(&sc->sc_ah->regulatory, sc->hw->wiphy,
ath9k_reg_notifier);
if (error)
goto bad;
/* default to MONITOR mode */

2
drivers/net/wireless/ath/regd.c
View file

@ -477,7 +477,7 @@ ath_regd_init(struct ath_regulatory *reg,
u16 regdmn;
if (!ath_regd_is_eeprom_valid(reg)) {
printk(KERN_DEBUG "ath: Invalid EEPROM contents\n");
printk(KERN_ERR "ath: Invalid EEPROM contents\n");
return -EINVAL;
}