ath9k: propagate hw initialization errors

We were never propagating hw initialization errors, lets
do that now and also use -EOPNOTSUPP when device revision is
not supported yet.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 4 insertions, 5 deletions

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 8228f41c9c33..2e09204fc8ac 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1223,7 +1223,7 @@ struct ath_hw *ath9k_hw_attach(u16 devid, struct ath_softc *sc, int *error)
                 ah = ath9k_hw_do_attach(devid, sc, error);
                 break;
         default:
-                *error = -ENXIO;
+                *error = -EOPNOTSUPP;
                 break;
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 292ac2b41891..ada5fef924c8 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1295,7 +1295,6 @@ static int ath9k_reg_notifier(struct wiphy *wiphy,
 static int ath_init(u16 devid, struct ath_softc *sc)
 {
         struct ath_hw *ah = NULL;
-        int status;
         int error = 0, i;
         int csz = 0;
 
@@ -1323,11 +1322,11 @@ static int ath_init(u16 devid, struct ath_softc *sc)
         /* XXX assert csz is non-zero */
         sc->cachelsz = csz << 2;        /* convert to bytes */
 
-        ah = ath9k_hw_attach(devid, sc, &status);
+        ah = ath9k_hw_attach(devid, sc, &error);
         if (ah == NULL) {
                 DPRINTF(sc, ATH_DBG_FATAL,
-                        "Unable to attach hardware; HAL status %d\n", status);
-                error = -ENXIO;
+                        "Unable to attach hardware; "
+                        "initialization status: %d\n", error);
                 goto bad;
         }
         sc->sc_ah = ah;