From patchwork Sat Jun 21 21:03:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rickard Strandqvist X-Patchwork-Id: 4394661 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 E911C9F26E for ; Sat, 21 Jun 2014 21:03:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1803D20211 for ; Sat, 21 Jun 2014 21:03:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 398EB2018A for ; Sat, 21 Jun 2014 21:03:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755726AbaFUVCq (ORCPT ); Sat, 21 Jun 2014 17:02:46 -0400 Received: from mail-we0-f182.google.com ([74.125.82.182]:57568 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754357AbaFUVCp (ORCPT ); Sat, 21 Jun 2014 17:02:45 -0400 Received: by mail-we0-f182.google.com with SMTP id q59so5116044wes.41 for ; Sat, 21 Jun 2014 14:02:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ydkn1h/ooy2bbcJEqLAp2tdpRYh/n0sKKvbTnPHywtQ=; b=A6KOdiOKMLnuSdyRKcRg60eBhL12JNwOahMaEXTc6gJu95P1dR3IWG+7Tz+dxZPftK 8rLk7K8lhAnAMExIufuFdWIrFV5ng5VgMRYb9kxkkQ0fPGFgTHa33RtbeWg74rVqULt1 kNOt/qorFMCZtamNwlhVWfmJpeJmctDEv4shes3SeTjRzxLHFzzvoxYgleG/IXYuOYz9 80qVNM/kdz8i8tJgo3gLHi6IxDsr1NeSdkA9VWyMs4qc8p+CcsWosrX6noxNUk11Td43 Ktaa67bu0RioX8rMkx7I1HZf/KJU1i5WVFY89BawUeUn1wyyMYKIGrM+5MbUTR3yEEjh bi6g== X-Gm-Message-State: ALoCoQn+U5beM8Rt71GKLPTdjeig9uDPgLFKVpvq4e9FdPm0q//ZO530ucYgYcaT7ZkLWhbHK+Cr X-Received: by 10.194.10.130 with SMTP id i2mr14792977wjb.70.1403384564031; Sat, 21 Jun 2014 14:02:44 -0700 (PDT) Received: from localhost.localdomain (h-245-62.a218.priv.bahnhof.se. [85.24.245.62]) by mx.google.com with ESMTPSA id wv8sm8906905wjb.1.2014.06.21.14.02.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jun 2014 14:02:43 -0700 (PDT) From: Rickard Strandqvist To: Larry Finger , Chaoming Li Cc: Rickard Strandqvist , "John W. Linville" , Peter Wu , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] net: wireless: rtlwifi: rtl8192de: hw.c: Cleaning up if statement that always evaluates to false Date: Sat, 21 Jun 2014 23:03:42 +0200 Message-Id: <1403384623-9737-2-git-send-email-rickard_strandqvist@spectrumdigital.se> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1403384623-9737-1-git-send-email-rickard_strandqvist@spectrumdigital.se> References: <1403384623-9737-1-git-send-email-rickard_strandqvist@spectrumdigital.se> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 I found a logical error in an if statement that always evaluates to false. This has after same discussion resulted in that we add a macro to handle this. Signed-off-by: Rickard Strandqvist --- drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192de/reg.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c index 2b08671..280c3da 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c @@ -1128,7 +1128,7 @@ static int _rtl92de_set_media_status(struct ieee80211_hw *hw, } rtl_write_byte(rtlpriv, REG_CR + 2, bt_msr); rtlpriv->cfg->ops->led_control(hw, ledaction); - if ((bt_msr & 0xfc) == MSR_AP) + if ((bt_msr & MSR_MASK) == MSR_AP) rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00); else rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66); diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/reg.h b/drivers/net/wireless/rtlwifi/rtl8192de/reg.h index 7f29b8d..315a298 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/reg.h +++ b/drivers/net/wireless/rtlwifi/rtl8192de/reg.h @@ -369,6 +369,7 @@ #define MSR_ADHOC 0x01 #define MSR_INFRA 0x02 #define MSR_AP 0x03 +#define MSR_MASK 0x03 /* 6. Adaptive Control Registers (Offset: 0x0160 - 0x01CF) */ /* ----------------------------------------------------- */