Return-path: Received: from mail30g.wh2.ocn.ne.jp ([220.111.41.239]:25327 "HELO mail30g.wh2.ocn.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755032Ab0ESBdW (ORCPT ); Tue, 18 May 2010 21:33:22 -0400 Received: from vs3007.wh2.ocn.ne.jp (125.206.180.235) by mail30g.wh2.ocn.ne.jp (RS ver 1.0.95vs) with SMTP id 2-096572800 for ; Wed, 19 May 2010 10:33:20 +0900 (JST) Subject: [PATCH v2 17/20] ath5k: fix NULL pointer in antenna configuration To: linville@tuxdriver.com From: Bruno Randolf Cc: ath5k-devel@lists.ath5k.org, linux-wireless@vger.kernel.org Date: Wed, 19 May 2010 10:32:09 +0900 Message-ID: <20100519013208.22206.11002.stgit@tt-desk> In-Reply-To: <20100519012528.22206.77550.stgit@tt-desk> References: <20100519012528.22206.77550.stgit@tt-desk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Sender: linux-wireless-owner@vger.kernel.org List-ID: If the channel is not set yet and we configure the antennas just store the setting. It will be activated during the next reset, when the channel is set. Signed-off-by: Bruno Randolf --- drivers/net/wireless/ath/ath5k/phy.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c index f369e7e..d9506e7 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c @@ -1793,6 +1793,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; switch (channel->hw_value & CHANNEL_MODES) {