From patchwork Wed Jun 15 13:10:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 881822 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5FDAhgi011972 for ; Wed, 15 Jun 2011 13:10:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753925Ab1FONKk (ORCPT ); Wed, 15 Jun 2011 09:10:40 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:62901 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753764Ab1FONKj (ORCPT ); Wed, 15 Jun 2011 09:10:39 -0400 Received: by pvg12 with SMTP id 12so254161pvg.19 for ; Wed, 15 Jun 2011 06:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=+cOudgD8fJFpkPISzYkOazCIkITq1s0wI7G+z9ZnVu4=; b=Bqs9tAvyjhvUyxqsf6JvZjgswwJreQmEBxMDktrMJvbQtp68jeI6+XftUn4ll7rZmW jhy1JKizdY8PBG4BFTIbs6tF6z6x3o4Jl7ajvyt2XCn94jqZIPKYf0DLnITs5LWxMx/i 6vfJvyPpawIXpEjtbMy15AF8GCuFfJ6gHoi9U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=U0otbagRYMG+TK498infNulL6BqPtV57M/LrhTZWXDjdJZI1rHVAypGXuGqPbDHt3n O264GpsR/3Mmy/5fYszW16jkkXFjWcfs1HdgL/dE4Eg43THSPxCs3EwLjSUKYbKpZ6hn hPVIrLc1aLKQGChQMpmFHuMM1mKbpFFYp9PfI= Received: by 10.68.27.39 with SMTP id q7mr206772pbg.440.1308143438635; Wed, 15 Jun 2011 06:10:38 -0700 (PDT) Received: from shale.localdomain ([41.139.221.94]) by mx.google.com with ESMTPS id w2sm293216pbg.21.2011.06.15.06.10.33 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Jun 2011 06:10:37 -0700 (PDT) Date: Wed, 15 Jun 2011 16:10:10 +0300 From: Dan Carpenter To: Stanislaw Gruszka Cc: "John W. Linville" , "open list:INTEL WIRELESS 39..." , kernel-janitors@vger.kernel.org Subject: [patch -next] iwlegacy: fix up brokenness caused by cleanup Message-ID: <20110615131009.GD23739@shale.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 15 Jun 2011 13:10:43 +0000 (UTC) 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 --- Compile tested only. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;