* [patch -next] iwlegacy: fix up brokenness caused by cleanup
@ 2011-06-15 13:10 Dan Carpenter
2011-06-16 8:14 ` Stanislaw Gruszka
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2011-06-15 13:10 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: John W. Linville, open list:INTEL WIRELESS 39..., kernel-janitors
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>
---
Compile tested only.
diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c
index 49a80bb..46242d2 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,
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-16 8:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-15 13:10 [patch -next] iwlegacy: fix up brokenness caused by cleanup Dan Carpenter
2011-06-16 8:14 ` Stanislaw Gruszka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).