From: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> Fix scsi status reporting yet again, reverting an earlier attempt. The status byte does not need to be shifted << 1. Code in other drivers that does "scp->result |= CHECK_CONDITION << 1;" works because CHECK_CONDITION macro is pre-shifted right 1 bit. Signed-off-by: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/scsi/hpsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/scsi/hpsa.c~hpsa-fix-scsi-status-reporting-yet-again drivers/scsi/hpsa.c --- a/drivers/scsi/hpsa.c~hpsa-fix-scsi-status-reporting-yet-again +++ a/drivers/scsi/hpsa.c @@ -930,7 +930,7 @@ static void complete_scsi_command(struct cmd->result = (DID_OK << 16); /* host byte */ cmd->result |= (COMMAND_COMPLETE << 8); /* msg byte */ - cmd->result |= (ei->ScsiStatus << 1); + cmd->result |= ei->ScsiStatus; /* copy the sense data whether we need to or not. */ memcpy(cmd->sense_buffer, ei->SenseInfo, _ -- 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
