From c8a7e4c29bbfa89ca07cd4efb81e73969b004108 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Mon, 3 Aug 2009 12:24:35 -0700
Subject: [PATCH] --- yaml --- r: 159403 b: refs/heads/master c:
 7819ac84b689b61340f29af6233fa1d15b76a6ef h: refs/heads/master i:   159401:
 4b11f8cdd80e55aeda1bfbeba3ca787455a72085   159399:
 4c26c098a173532972ec982566f102030ae5c3fe v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/hw.c   | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/main.c | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b20391f41587..919ca794d0ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbf54660d1b48fba8527aae5c628ba72feee8f83
+refs/heads/master: 7819ac84b689b61340f29af6233fa1d15b76a6ef
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c
index 8228f41c9c33..2e09204fc8ac 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/hw.c
+++ b/trunk/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/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c
index 292ac2b41891..ada5fef924c8 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/main.c
+++ b/trunk/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;