From be58fe070ef532387e8a12b799be1359ed29d203 Mon Sep 17 00:00:00 2001
From: Bruno Randolf <br1@einfach.org>
Date: Mon, 7 Jun 2010 13:11:19 +0900
Subject: [PATCH] --- yaml --- r: 200277 b: refs/heads/master c:
 436c109adb54433fff689abd71c23a6505e46bb0 h: refs/heads/master i:   200275:
 2c259213872f78df4d40fc755dd4ccd626df4d26 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/wireless/ath/ath5k/phy.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c43b16beee54..b352340190f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f666a08901f8b01f294ca0ad751019375240ae3
+refs/heads/master: 436c109adb54433fff689abd71c23a6505e46bb0
diff --git a/trunk/drivers/net/wireless/ath/ath5k/phy.c b/trunk/drivers/net/wireless/ath/ath5k/phy.c
index 1b81c4778800..492cbb15720d 100644
--- a/trunk/drivers/net/wireless/ath/ath5k/phy.c
+++ b/trunk/drivers/net/wireless/ath/ath5k/phy.c
@@ -1814,6 +1814,13 @@ ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)
 	u8 def_ant, tx_ant, ee_mode;
 	u32 sta_id1 = 0;
 
+	/* if channel is not initialized yet we can't set the antennas
+	 * so just store the mode. it will be set on the next reset */
+	if (channel == NULL) {
+		ah->ah_ant_mode = ant_mode;
+		return;
+	}
+
 	def_ant = ah->ah_def_ant;
 
 	ATH5K_TRACE(ah->ah_sc);