iwlagn: fix priv->cfg->ht_params NULL pointer dereference

[pandora-kernel.git] / drivers / net / wireless / iwlwifi / iwl-agn-rxon.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index a580efe..58a381c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -294,8 +294,8 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv,
                return ret;
        }
 
-       if ((ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION) &&
-           priv->cfg->ht_params->smps_mode)
+       if (ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION &&
+           priv->cfg->ht_params && priv->cfg->ht_params->smps_mode)
                ieee80211_request_smps(ctx->vif,
                                       priv->cfg->ht_params->smps_mode);