scsi: core: Do not use DRIVER_INVALID

[sfrench/cifs-2.6.git] / drivers / scsi / mvumi.c

diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index f612505450250823061a9922ce8abacad7727454..6bb03d7a254dec3de935a244c04e2334df40c40a 100644 (file)
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -1320,7 +1320,7 @@ static void mvumi_complete_cmd(struct mvumi_hba *mhba, struct mvumi_cmd *cmd,
                }
                break;
        default:
-               scmd->result |= (DRIVER_INVALID << 24) | (DID_ABORT << 16);
+               scmd->result |= (DID_ABORT << 16);
                break;
        }
 
@@ -2127,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),