summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChing Huang <ching2048@areca.com.tw>2017-12-05 04:28:37 +0100
committerMartin K. Petersen <martin.petersen@oracle.com>2017-12-07 01:32:42 +0100
commitfa576b43f66ef67d1db5730b5745c468b1f9ed2b (patch)
tree38313458ddaa43cb7feacd6a3a65a6054b0bfad8 /drivers
parentscsi: arcmsr: Update driver version to v1.40.00.04-20171130 (diff)
downloadlinux-fa576b43f66ef67d1db5730b5745c468b1f9ed2b.tar.xz
linux-fa576b43f66ef67d1db5730b5745c468b1f9ed2b.zip
scsi: arcmsr: Fix command result for CHECK_CONDITION
Fix report command result error when CHECK_CONDITION. Signed-off-by: Ching Huang <ching2048@areca.com.tw> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/arcmsr/arcmsr_hba.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 6d165e5fef15..0707a60bf5c0 100644
--- 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);
}
}