Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6f0f048 authored by Dan Carpenter's avatar Dan Carpenter Committed by John W. Linville
Browse files

iwlegacy: fix up brokenness caused by cleanup



Patch 7f1f9742 "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: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d4bb17c4
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -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;