aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/iwl4965-base.c
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-06-15 09:10:10 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-06-17 14:22:24 -0400
commita6f0f048875a07b2926c075744eb5edc41bc3c1d (patch)
treead96a48d760f565677e3eff8a3d5cc2e41a253cc /drivers/net/wireless/iwlegacy/iwl4965-base.c
parentd4bb17c4bed70892ea8b749a843a516424ba5638 (diff)
iwlegacy: fix up brokenness caused by cleanup
Patch 7f1f9742514 "iwlegacy: refactor iwl4965_mac_channel_switch" reversed a test and also it changed a spin_lock_irq() to spin_lock(). I assume the spin_lock change was a mistake because the unlock was left as spin_unlock_irq(). Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl4965-base.c')
-rw-r--r--drivers/net/wireless/iwlegacy/iwl4965-base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c
index 49a80bb70634..46242d2aa5ad 100644
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
@@ -2526,7 +2526,7 @@ void iwl4965_mac_channel_switch(struct ieee80211_hw *hw,
2526 if (!iwl_legacy_is_associated_ctx(ctx)) 2526 if (!iwl_legacy_is_associated_ctx(ctx))
2527 goto out; 2527 goto out;
2528 2528
2529 if (priv->cfg->ops->lib->set_channel_switch) 2529 if (!priv->cfg->ops->lib->set_channel_switch)
2530 goto out; 2530 goto out;
2531 2531
2532 ch = channel->hw_value; 2532 ch = channel->hw_value;
@@ -2539,7 +2539,7 @@ void iwl4965_mac_channel_switch(struct ieee80211_hw *hw,
2539 goto out; 2539 goto out;
2540 } 2540 }
2541 2541
2542 spin_lock(&priv->lock); 2542 spin_lock_irq(&priv->lock);
2543 2543
2544 priv->current_ht_config.smps = conf->smps_mode; 2544 priv->current_ht_config.smps = conf->smps_mode;
2545 2545