diff --git a/[refs] b/[refs]
index 752e7804777c..46f6e40c0667 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21394754bcca59aeb4a0b74c95c0220bb727808f
+refs/heads/master: 86fbe17d7f0856f4111e1ceaf3f5c399315fb4e7
diff --git a/trunk/drivers/net/wireless/ath/ath5k/ani.c b/trunk/drivers/net/wireless/ath/ath5k/ani.c
index a08f17318e63..b88d10c3b9e0 100644
--- a/trunk/drivers/net/wireless/ath/ath5k/ani.c
+++ b/trunk/drivers/net/wireless/ath/ath5k/ani.c
@@ -630,6 +630,11 @@ ath5k_ani_init(struct ath5k_hw *ah, enum ath5k_ani_mode mode)
 	if (ah->ah_version < AR5K_AR5212)
 		return;
 
+	if (mode < ATH5K_ANI_MODE_OFF || mode > ATH5K_ANI_MODE_AUTO) {
+		ATH5K_ERR(ah->ah_sc, "ANI mode %d out of range", mode);
+		return;
+	}
+
 	/* clear old state information */
 	memset(&ah->ah_sc->ani_state, 0, sizeof(ah->ah_sc->ani_state));