From: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> hpsa: Fix incorrect SCSI status reporting Signed-off-by: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> --- drivers/scsi/hpsa.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 0e696ee..380236a 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -930,7 +930,7 @@ static void complete_scsi_command(struct CommandList *cp, cmd->result = (DID_OK << 16); /* host byte */ cmd->result |= (COMMAND_COMPLETE << 8); /* msg byte */ - cmd->result |= (ei->ScsiStatus); + cmd->result |= (ei->ScsiStatus << 1); /* copy the sense data whether we need to or not. */ memcpy(cmd->sense_buffer, ei->SenseInfo, @@ -991,7 +991,6 @@ static void complete_scsi_command(struct CommandList *cp, /* Must be some other type of check condition */ - cmd->result |= (ei->ScsiStatus << 1); dev_warn(&h->pdev->dev, "cp %p has check condition: " "unknown type: " "Sense: 0x%x, ASC: 0x%x, ASCQ: 0x%x, " @@ -1013,8 +1012,6 @@ static void complete_scsi_command(struct CommandList *cp, * Pass it up to the upper layers... */ if (ei->ScsiStatus) { - - cmd->result |= (ei->ScsiStatus << 1); dev_warn(&h->pdev->dev, "cp %p has status 0x%x " "Sense: 0x%x, ASC: 0x%x, ASCQ: 0x%x, " "Returning result: 0x%x\n", -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html