Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...

[net-next-2.6.git] / drivers / net / wireless / iwlwifi / iwl-sta.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index 4d878d8cbbeec172e9c16c9360e9719d3edab9c6..c7127132c29843a2851f34738ac901909633d73f 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -432,7 +432,7 @@ int iwl_add_bssid_station(struct iwl_priv *priv, const u8 *addr, bool init_rs,
        struct iwl_link_quality_cmd *link_cmd;
        unsigned long flags;
 
-       if (*sta_id_r)
+       if (sta_id_r)
                *sta_id_r = IWL_INVALID_STATION;
 
        ret = iwl_add_station_common(priv, addr, 0, NULL, &sta_id);