[SRU][Trusty][PATCH 1/1] [SCSI] hpsa: allow SCSI mid layer to handle unit attention

[Joseph Salisbury]

From: Matt Gates <matthew.gates at hp.com>

BugLink: http://bugs.launchpad.net/bugs/1512415

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 at hp.com>
Acked-by: Stephen M. Cameron <scameron at beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley at Parallels.com>
(cherry picked from commit 3ce438df106826edde7ad724f3819716a3f0cf56)
Signed-off-by: Joseph Salisbury <joseph.salisbury at canonical.com>
---
 drivers/scsi/hpsa.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index d518bba..cfeb5a4 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1260,10 +1260,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
-- 
1.9.1