scsi: nsp32: fix logic bug in error handling
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 <arnd@arndb.de> Acked-by: GOTO Masanori <gotom@debian.or.jp> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
3e35127565
commit
287f79653a
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue