scsi: myrs: Fix a logical vs bitwise bug

Dan Carpenter · martinkpetersen · commit 9a231caa77c3 · 2018-10-19T18:30:28.000-04:00
The || was supposed to be |. The original code just sets ->result to 1. Fixes: 7726618 ("scsi: myrs: Add Mylex RAID controller (SCSI interface)") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c
@@ -2086,7 +2086,7 @@ static void myrs_handle_scsi(struct myrs_hba *cs, struct myrs_cmdblk *cmd_blk,
 	    status == MYRS_STATUS_DEVICE_NON_RESPONSIVE2)
 		scmd->result = (DID_BAD_TARGET << 16);
 	else
-		scmd->result = (DID_OK << 16) || status;
+		scmd->result = (DID_OK << 16) | status;
 	scmd->scsi_done(scmd);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2086,7 +2086,7 @@ static void myrs_handle_scsi(struct myrs_hba cs, struct myrs_cmdblk cmd_blk,`
`2086`	`2086`	`status == MYRS_STATUS_DEVICE_NON_RESPONSIVE2)`
`2087`	`2087`	`scmd->result = (DID_BAD_TARGET << 16);`
`2088`	`2088`	`else`
`2089`		`- scmd->result = (DID_OK << 16) \|\| status;`
	`2089`	`+ scmd->result = (DID_OK << 16) \| status;`
`2090`	`2090`	`scmd->scsi_done(scmd);`
`2091`	`2091`	`}`
`2092`	`2092`