diff --git a/[refs] b/[refs]
index f1d7d1da7b90..d16f78b7ac2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4bb17c4bed70892ea8b749a843a516424ba5638
+refs/heads/master: a6f0f048875a07b2926c075744eb5edc41bc3c1d
diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl4965-base.c b/trunk/drivers/net/wireless/iwlegacy/iwl4965-base.c
index 49a80bb70634..46242d2aa5ad 100644
--- a/trunk/drivers/net/wireless/iwlegacy/iwl4965-base.c
+++ b/trunk/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;