From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751474AbdIEHwc (ORCPT ); Tue, 5 Sep 2017 03:52:32 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:61183 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750810AbdIEHwb (ORCPT ); Tue, 5 Sep 2017 03:52:31 -0400 From: Arnd Bergmann To: GOTO Masanori , YOKOTA Hiroshi , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Arnd Bergmann , Hannes Reinecke , Johannes Thumshirn , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: nsp32: fix logic bug in error handling Date: Tue, 5 Sep 2017 09:51:29 +0200 Message-Id: <20170905075139.518406-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:Sl2UeSe8+KXFIyM3nzG40gC1Zvc+nN+r91LFaPJwWmoNT09h6QO 1mlZ1iXwo+Y9brYowKaxFUCKY3tHaTti/ZOXElqU3Vue/xY99S3dZMIeCo0hnwsVGzINfh1 6QJt1vp+J52n6F5PsNjEePFY2aJQddZoaSf2c5CFzhVa1x+3MEe1gAPiFLJAUv1qGKVVFi4 IKjTpJGfp2zhBIc/aP5Hg== X-UI-Out-Filterresults: notjunk:1;V01:K0:CDVVtqVCWRk=:2U+MfW3JBJsLSWDsT3OEYo a5GEo+c/vqRelhP2EfbE/HjuWz2JN0hvrwN8aQbClEH14BKE6wmAF1nAszQnYvV13uoCytVP+ RYG9/tfl6EnQrlmC+IbF8UJxQlqSQ9S5+jXMQVSMvpXlHrN1VgLOaYTfEj26wHC69Voi5raXI KfOnQMUXqhxHjalYLjW1MIGkJzqeV8ig1y3B0C40fl+0clJbpmwLXYu+Zc/3jHT3EKCTVE49o zC6onzqTRmU9tQcK7zfgHm+RlVU92sF7LTrq48TOQFxWV3vlLOBKOxft4TyUkaQpbhA1/zy4b yGM96UGMaJ0Ji9rt1O2zYoStVkZIx/cB8cvbJN3Q2J5dtJLhTLVyijA+c4pZ0D7jdvZ4YbnNs V/M7A3iX8hsCvZLc08i8K5b2RxRFHglzbmN93jLVfJ3BajoFC3fYctjFFg6JKdSGLy3j7jplU BIIY2k/2G+0nX+iTghIYsfEf3onsvcTDD8EoA9lnc+imrY9h8Shn6F99+vzalPEsyqlv5OgQp lvPN+6mhSgQWLHSlxpn1+bD3CSkk4hL0vBTM+m9syF6RsCp9+kM+g6rUyBV8z0SY3vFFHhtRD 3+zivtYqMe4vkvachHF/vgiluPj4GH+fmvGX1wIcM+nNWDHDt9QU5LeBkz5doRj5WYXOI6gjR H6dId9YVU3/mqDKpn6Omoe9QK6ggVmC65PQ5tCCsP3z+UqRyxmp/F9uomCSPJPqrwgs7Xu/3q Z2NWmX0oXFHut+xZiwx/ZVF6MhTy/c3AlDq7Sg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-8 points out a logic error that has existed since the start of the git history: drivers/scsi/nsp32.c: In function 'nsp32_selection_autoscsi': drivers/scsi/nsp32.c:607:27: error: bitwise comparison always evaluates to false [-Werror=tautological-compare] if(((phase & BUSMON_BSY) == 1) || (phase & BUSMON_SEL) == 1) { ^~ Presumably the author intended to check if one of two bits was set, so that's what I'm changing the code to. This will obviously change the behavior of the code, hopefully to do the right thing, but I have not tested this or checked if the new "(phase & BUSMON_BSY) || (phase & BUSMON_SEL)" condition should indeed be treated as a fatal error. Signed-off-by: Arnd Bergmann --- drivers/scsi/nsp32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c index 107e191bf023..8620ac5d6e41 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c @@ -604,7 +604,7 @@ static int nsp32_selection_autoscsi(struct scsi_cmnd *SCpnt) * check bus line */ phase = nsp32_read1(base, SCSI_BUS_MONITOR); - if(((phase & BUSMON_BSY) == 1) || (phase & BUSMON_SEL) == 1) { + if ((phase & BUSMON_BSY) || (phase & BUSMON_SEL)) { nsp32_msg(KERN_WARNING, "bus busy"); SCpnt->result = DID_BUS_BUSY << 16; status = 1; -- 2.9.0