From 9a231caa77c3afdf775bcc9b7c403244deb3d539 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 19 Oct 2018 12:16:28 +0300 Subject: scsi: myrs: Fix a logical vs bitwise bug The || was supposed to be |. The original code just sets ->result to 1. Fixes: 77266186397c ("scsi: myrs: Add Mylex RAID controller (SCSI interface)") Signed-off-by: Dan Carpenter Signed-off-by: Martin K. Petersen --- drivers/scsi/myrs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/scsi/myrs.c') diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c index a9f9c77e889f..947d9b63d922 100644 --- 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); } -- cgit v1.2.3-59-g8ed1b