From 36bebdd53dcf23a58727726cf6faa1bf3419abe8 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sun, 26 Dec 2010 18:22:16 +0100
Subject: [PATCH] --- yaml --- r: 225531 b: refs/heads/master c:
 3b386510f49ff5c6e6ac1001da4f3c922ae7de3f h: refs/heads/master i:   225529:
 15159bd31f5f77681cddeef1d306316223cd4ce0   225527:
 9f65d880adc9676842a2aaaa3fc0371e8f87f6da v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/ath/carl9170/phy.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index d0ff666b7baf..b7c077e757c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9e57f0fdccf74ef7884fed61d212e524b9c4bcd
+refs/heads/master: 3b386510f49ff5c6e6ac1001da4f3c922ae7de3f
diff --git a/trunk/drivers/net/wireless/ath/carl9170/phy.c b/trunk/drivers/net/wireless/ath/carl9170/phy.c
index 122e75ee8eff..b6b0de600506 100644
--- a/trunk/drivers/net/wireless/ath/carl9170/phy.c
+++ b/trunk/drivers/net/wireless/ath/carl9170/phy.c
@@ -1029,8 +1029,6 @@ static int carl9170_init_rf_bank4_pwr(struct ar9170 *ar, bool band5ghz,
 	if (err)
 		return err;
 
-	msleep(20);
-
 	return 0;
 }
 
@@ -1660,12 +1658,6 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
 			return err;
 
 		cmd = CARL9170_CMD_RF_INIT;
-
-		msleep(100);
-
-		err = carl9170_echo_test(ar, 0xaabbccdd);
-		if (err)
-			return err;
 	} else {
 		cmd = CARL9170_CMD_FREQUENCY;
 	}