From patchwork Fri Apr 4 16:21:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Merello X-Patchwork-Id: 3939491 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 482129F1EE for ; Fri, 4 Apr 2014 16:22:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4BDE020384 for ; Fri, 4 Apr 2014 16:22:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 470F220381 for ; Fri, 4 Apr 2014 16:22:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753970AbaDDQV5 (ORCPT ); Fri, 4 Apr 2014 12:21:57 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:48621 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753968AbaDDQVy (ORCPT ); Fri, 4 Apr 2014 12:21:54 -0400 Received: by mail-wg0-f48.google.com with SMTP id l18so3750429wgh.7 for ; Fri, 04 Apr 2014 09:21:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8y+xmw/ggXJ0+RcBzzm4JjrTGnKW00tfKEMj7jeXfv8=; b=tbdhCSZMhXP0zUrqBY9S/vT6kMP146kyZBmhL94NlEeQ8Z6JVKy8SuMgzL2Y3xcAUS vAyMyQYUeqGQcLphoDAiQGFfdxJvc9FwIV/wRsfoi3yyw59hozA18siUb3EKQLtZkBW6 IWY/UUuonb0Ywc0hb1fOyo7kYAFfwjh8UUnEam1ssgu4xPcjtEUnK3W5nN8v+EBoXZ9r tWsuuQRBOeCrHS4SPIfwKlpAsy2rwm6CGGuWoQopdTZ97edvZt7VG6b+L38oBbw1dpP/ szSv9EgwyFvMogDcrWp7J2cnADSFOIrNLgdPImgTTq7UVbJBOw2u6aoijhv9uGEdLI/r um1w== X-Received: by 10.180.24.134 with SMTP id u6mr5864447wif.41.1396628513132; Fri, 04 Apr 2014 09:21:53 -0700 (PDT) Received: from localhost.localdomain (host90-15-dynamic.249-95-r.retail.telecomitalia.it. [95.249.15.90]) by mx.google.com with ESMTPSA id 44sm20502521eek.30.2014.04.04.09.21.51 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Apr 2014 09:21:52 -0700 (PDT) From: Andrea Merello To: linville@tuxdriver.com, fengguang.wu@intel.com, julia.lawall@lip6.fr Cc: linux-wireless@vger.kernel.org, Larry.Finger@lwfinger.net, bernhard@schiffner-limbach.de, dan.carpenter@oracle.com, andrea.merello@gmail.com Subject: [PATCH 2/4] rtl8180: fix enabled interrupt mask for rtl8187se Date: Fri, 4 Apr 2014 18:21:14 +0200 Message-Id: <1396628474-14461-1-git-send-email-andrea.merello@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <20140403054254.GA18196@localhost> References: <20140403054254.GA18196@localhost> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When preparing the bitfield to write to HW register, the high-priority queue error interrupt bit is set two times, and the beacon queue TX-OK interrupt is not enabled. Currently this have no functional impact because the high-priority queue is not used at all, and the beacon queue is not used yet. This patch removes high-priority queue bits and it adds the beacon queue missing bit. It removes also the management queue bits because it is not used. This was found by static code analyzer. Reported-by: Fengguang Wu Reported-by: Julia Lawall Signed-off-by: Andrea Merello --- drivers/net/wireless/rtl818x/rtl8180/dev.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c index 98d8256f..cb8275f 100644 --- a/drivers/net/wireless/rtl818x/rtl8180/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c @@ -683,9 +683,8 @@ static void rtl8180_int_enable(struct ieee80211_hw *dev) struct rtl8180_priv *priv = dev->priv; if (priv->chip_family == RTL818X_CHIP_FAMILY_RTL8187SE) { - rtl818x_iowrite32(priv, &priv->map->IMR, IMR_TMGDOK | - IMR_TBDER | IMR_THPDER | - IMR_THPDER | IMR_THPDOK | + rtl818x_iowrite32(priv, &priv->map->IMR, + IMR_TBDER | IMR_TBDOK | IMR_TVODER | IMR_TVODOK | IMR_TVIDER | IMR_TVIDOK | IMR_TBEDER | IMR_TBEDOK |