scsi: arcmsr: Fix command result for CHECK_CONDITION

Ching Huang · martinkpetersen · commit fa576b43f66e · 2017-12-06T19:32:42.000-05:00
Fix report command result error when CHECK_CONDITION.

Signed-off-by: Ching Huang &lt;ching2048@areca.com.tw&gt;
Signed-off-by: Martin K. Petersen &lt;martin.petersen@oracle.com&gt;
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -1205,7 +1205,7 @@ static void arcmsr_report_sense_info(struct CommandControlBlock *ccb)
 
 	struct scsi_cmnd *pcmd = ccb->pcmd;
 	struct SENSE_DATA *sensebuffer = (struct SENSE_DATA *)pcmd->sense_buffer;
-	pcmd->result = DID_OK << 16;
+	pcmd->result = (DID_OK << 16) | (CHECK_CONDITION << 1);
 	if (sensebuffer) {
 		int sense_data_length =
 			sizeof(struct SENSE_DATA) < SCSI_SENSE_BUFFERSIZE
@@ -1214,6 +1214,7 @@ static void arcmsr_report_sense_info(struct CommandControlBlock *ccb)
 		memcpy(sensebuffer, ccb->arcmsr_cdb.SenseData, sense_data_length);
 		sensebuffer->ErrorCode = SCSI_SENSE_CURRENT_ERRORS;
 		sensebuffer->Valid = 1;
+		pcmd->result |= (DRIVER_SENSE << 24);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1205,7 +1205,7 @@ static void arcmsr_report_sense_info(struct CommandControlBlock *ccb)`
`1205`	`1205`
`1206`	`1206`	`struct scsi_cmnd *pcmd = ccb->pcmd;`
`1207`	`1207`	`struct SENSE_DATA sensebuffer = (struct SENSE_DATA )pcmd->sense_buffer;`
`1208`		`- pcmd->result = DID_OK << 16;`
	`1208`	`+ pcmd->result = (DID_OK << 16) \| (CHECK_CONDITION << 1);`
`1209`	`1209`	`if (sensebuffer) {`
`1210`	`1210`	`int sense_data_length =`
`1211`	`1211`	`sizeof(struct SENSE_DATA) < SCSI_SENSE_BUFFERSIZE`
`@@ -1214,6 +1214,7 @@ static void arcmsr_report_sense_info(struct CommandControlBlock *ccb)`
`1214`	`1214`	`memcpy(sensebuffer, ccb->arcmsr_cdb.SenseData, sense_data_length);`
`1215`	`1215`	`sensebuffer->ErrorCode = SCSI_SENSE_CURRENT_ERRORS;`
`1216`	`1216`	`sensebuffer->Valid = 1;`
	`1217`	`+ pcmd->result \|= (DRIVER_SENSE << 24);`
`1217`	`1218`	`}`
`1218`	`1219`	`}`
`1219`	`1220`