diff --git a/[refs] b/[refs]
index 723d1da3e5c2..ec7127445d31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2203d6be7ed17af81a1dc35a0af9806086743b02
+refs/heads/master: e2a0ccebc4ffabc1c7234cfd324299b5a936e0f2
diff --git a/trunk/drivers/net/wireless/ath5k/hw.c b/trunk/drivers/net/wireless/ath5k/hw.c
index dc51b844c62d..3937e46e4735 100644
--- a/trunk/drivers/net/wireless/ath5k/hw.c
+++ b/trunk/drivers/net/wireless/ath5k/hw.c
@@ -1078,6 +1078,19 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
 		mdelay(1);
 	}
 
+	/*
+	 * Perform ADC test (?)
+	 */
+	data = ath5k_hw_reg_read(ah, AR5K_PHY_TST1);
+	ath5k_hw_reg_write(ah, AR5K_PHY_TST1_TXHOLD, AR5K_PHY_TST1);
+	for (i = 0; i <= 20; i++) {
+		if (!(ath5k_hw_reg_read(ah, AR5K_PHY_ADC_TEST) & 0x10))
+			break;
+		udelay(200);
+	}
+	ath5k_hw_reg_write(ah, data, AR5K_PHY_TST1);
+	data = 0;
+
 	/*
 	 * Enable calibration and wait until completion
 	 */