Merge tag 'm68knommu-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / scsi / mvumi.c

diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index 9d57436..6bb03d7 100644 (file)
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -1317,11 +1317,10 @@ static void mvumi_complete_cmd(struct mvumi_hba *mhba, struct mvumi_cmd *cmd,
                if (ob_frame->rsp_flag & CL_RSP_FLAG_SENSEDATA) {
                        memcpy(cmd->scmd->sense_buffer, ob_frame->payload,
                                sizeof(struct mvumi_sense_data));
-                       scmd->result |=  (DRIVER_SENSE << 24);
                }
                break;
        default:
-               scmd->result |= (DRIVER_INVALID << 24) | (DID_ABORT << 16);
+               scmd->result |= (DID_ABORT << 16);
                break;
        }
 
@@ -2068,10 +2067,7 @@ static unsigned char mvumi_build_frame(struct mvumi_hba *mhba,
        return 0;
 
 error:
-       scmd->result = (DID_OK << 16) | (DRIVER_SENSE << 24) |
-               SAM_STAT_CHECK_CONDITION;
-       scsi_build_sense_buffer(0, scmd->sense_buffer, ILLEGAL_REQUEST, 0x24,
-                                                                       0);
+       scsi_build_sense(scmd, 0, ILLEGAL_REQUEST, 0x24, 0);
        return -1;
 }
 
@@ -2131,7 +2127,7 @@ static enum blk_eh_timer_return mvumi_timed_out(struct scsi_cmnd *scmd)
        else
                atomic_dec(&mhba->fw_outstanding);
 
-       scmd->result = (DRIVER_INVALID << 24) | (DID_ABORT << 16);
+       scmd->result = (DID_ABORT << 16);
        scmd->SCp.ptr = NULL;
        if (scsi_bufflen(scmd)) {
                dma_unmap_sg(&mhba->pdev->dev, scsi_sglist(scmd),