[SCSI] hpsa: allow SCSI mid layer to handle unit attention

We were clobbering the SCSI status and setting
cmd->result = DID_SOFT_ERROR << 16; to get a retry,
but better to let the mid layer handle the unit
attention.

Signed-off-by: Matt Gates <matthew.gates@hp.com>
Acked-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index d5f2ff9918faf3b973adf202c5c72b4f7afb14c9..868318a7067c51ba63753afacc294df5341ea18c 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1241,10 +1241,8 @@ static void complete_scsi_command(struct CommandList *cp)
                }
 
                if (ei->ScsiStatus == SAM_STAT_CHECK_CONDITION) {
-                       if (check_for_unit_attention(h, cp)) {
-                               cmd->result = DID_SOFT_ERROR << 16;
+                       if (check_for_unit_attention(h, cp))
                                break;
-                       }
                        if (sense_key == ILLEGAL_REQUEST) {
                                /*
                                 * SCSI REPORT_LUNS is commonly unsupported on