3 files changed, 6 insertions, 3 deletions

diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
index 8de0ff9f580..857416c8019 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)
 
         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)
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 8bf2bf36fd6..2398d4f45f2 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -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 */
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index 4b5c851b81f..526c7f1308d 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,
         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;
         }