diff --git a/[refs] b/[refs]
index 97f3127d4883..e6ce1f07e834 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95fafca26dc317b7ea0667c57576b0b5389f5bef
+refs/heads/master: 2f69ffacb303bba274b126eabd3a3ed011b2d35d
diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c
index a5475b7a59de..7f412dd9b9fb 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/main.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/main.c
@@ -1363,9 +1363,6 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc)
 	for (i = 0; i < sc->keymax; i++)
 		ath9k_hw_keyreset(ah, (u16) i);
 
-	if (r)
-		goto bad;
-
 	/* default to MONITOR mode */
 	sc->sc_ah->opmode = NL80211_IFTYPE_MONITOR;