Skip to content

Commit

Permalink
iwlegacy: fix up brokenness caused by cleanup
Browse files Browse the repository at this point in the history
Patch 7f1f974 "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>
  • Loading branch information
Dan Carpenter authored and John W. Linville committed Jun 17, 2011
1 parent d4bb17c commit a6f0f04
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/iwlegacy/iwl4965-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -2526,7 +2526,7 @@ void iwl4965_mac_channel_switch(struct ieee80211_hw *hw,
if (!iwl_legacy_is_associated_ctx(ctx))
goto out;

if (priv->cfg->ops->lib->set_channel_switch)
if (!priv->cfg->ops->lib->set_channel_switch)
goto out;

ch = channel->hw_value;
Expand All @@ -2539,7 +2539,7 @@ void iwl4965_mac_channel_switch(struct ieee80211_hw *hw,
goto out;
}

spin_lock(&priv->lock);
spin_lock_irq(&priv->lock);

priv->current_ht_config.smps = conf->smps_mode;

Expand Down

0 comments on commit a6f0f04

Please sign in to comment.