From patchwork Fri Jul 15 23:40:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 649064 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rrpwl6ppDz9sBR for ; Sat, 16 Jul 2016 09:40:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=bSGAlacc; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751696AbcGOXki (ORCPT ); Fri, 15 Jul 2016 19:40:38 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35408 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751431AbcGOXkg (ORCPT ); Fri, 15 Jul 2016 19:40:36 -0400 Received: by mail-pf0-f195.google.com with SMTP id t190so7105263pfb.2; Fri, 15 Jul 2016 16:40:36 -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; bh=ql/gVlScefsqR6VO2+kFExXSNjBN6AUgIxBkLsoi5Rk=; b=bSGAlaccS8R4FPi96w+XDxAEdybxvlOfbF3TvHSAJu6a4g+Cyi+B65MvUIgmFYHVAB 5gW2+kRQb5sUgMETRc9HoF/tJjVV9AYvTOYG7btRP9GyuGrmd5EGAYER/VH9UVsWXgqa wEymYDLSk+QBWBJ39XvFqyC3UVmshLj8dkBGjvOTwSWucrt5JKPWZp8tKcidEC+9gHZP BGOpDpg9NNf9dXZ7Em/0mMV+3tN8Is9oviOTyUjQWq6MWqjFslfqEe4L+otpVJ7vXpnF OANEu7zOORjDBKiRHHgnasCIfAaaXMkNxqsLwjTPxxFkYadmq3HNpcZfZKyMFJc4q2e3 FImQ== 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; bh=ql/gVlScefsqR6VO2+kFExXSNjBN6AUgIxBkLsoi5Rk=; b=m6R+OzGudKWySBG20udY26+oTO0jmpvHuTFnvkKZOZerzfXc+Qx1SwXd6FOHxtGKtz KLzgKW0FD8CoE1cG4F72XlYYVgftaMOzdu4uHguV6VjFmD2QIusDQrwjrDNAbF/NY2Hn HKG+F6o7aZ/CjzQUEICvfnB4l5MMKIWPizdmXDdVPfABLjsGMpX2R3OQOWmQod52Kk4l gd7uJHaIGSOwY1fq2ckaJbdKD0nPCLhes+h9pBYnF503o45AutDFkGLzT+oiSU+Xzsxk xlJezZdOoPHx8PdLD7t0eNQdYhNzjB0nZJdnvQTdwas3dtdU/mLAOFGQls6w1ETBzEw2 oO5A== X-Gm-Message-State: ALyK8tIvK3cox6dLyNYRfaHJPDoDybSDNtaJRTSNPcXFYdtwIFBAFQl3WzUJDEiM1aXxjA== X-Received: by 10.98.2.208 with SMTP id 199mr25867592pfc.80.1468626035861; Fri, 15 Jul 2016 16:40:35 -0700 (PDT) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by smtp.gmail.com with ESMTPSA id o68sm5874635pfb.18.2016.07.15.16.40.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Jul 2016 16:40:34 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, Florian Fainelli , Mark Einon , Andrew Lunn , Antonio Quartulli , Felipe Balbi , Florian Westphal , Insu Yun , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net] et131x: Fix logical vs bitwise check in et131x_tx_timeout() Date: Fri, 15 Jul 2016 16:40:22 -0700 Message-Id: <1468626024-31534-1-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We should be using a logical check here instead of a bitwise operation to check if the device is closed already in et131x_tx_timeout(). Reported-by: coverity (CID 146498) Fixes: 38df6492eb511 ("et131x: Add PCIe gigabit ethernet driver et131x to drivers/net") Signed-off-by: Florian Fainelli --- drivers/net/ethernet/agere/et131x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c index 30defe6c81f2..821d86c38ab2 100644 --- a/drivers/net/ethernet/agere/et131x.c +++ b/drivers/net/ethernet/agere/et131x.c @@ -3851,7 +3851,7 @@ static void et131x_tx_timeout(struct net_device *netdev) unsigned long flags; /* If the device is closed, ignore the timeout */ - if (~(adapter->flags & FMP_ADAPTER_INTERRUPT_IN_USE)) + if (!(adapter->flags & FMP_ADAPTER_INTERRUPT_IN_USE)) return; /* Any nonrecoverable hardware error?