The patch titled hpsa: fix incorrect SCSI status reporting has been added to the -mm tree. Its filename is hpsa-fix-incorrect-scsi-status-reporting.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: hpsa: fix incorrect SCSI status reporting From: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> Signed-off-by: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> Cc: Mike Miller <mikem@xxxxxxxxxxxxxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> Cc: Alex Chiang <achiang@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/scsi/hpsa.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff -puN drivers/scsi/hpsa.c~hpsa-fix-incorrect-scsi-status-reporting drivers/scsi/hpsa.c --- a/drivers/scsi/hpsa.c~hpsa-fix-incorrect-scsi-status-reporting +++ 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); + 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 /* 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 * 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", _ Patches currently in -mm which might be from scameron@xxxxxxxxxxxxxxxxxx are origin.patch scsi-add-hpsa-driver-for-hp-smart-array-controllers.patch hpsa-use-msleep-instead-of-schedule_timeout.patch hpsa-use-msleep-instead-of-schedule_timeout-fix.patch hpsa-rename-too-generic-variable-names.patch hpsa-return-scsi_mlqueue_host_busy-on-command-allocation-failure.patch hpsa-fix-incorrect-scsi-status-reporting.patch hpsa-suppress-messages-due-to-unsupport-scsi-report_luns.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html