---

yaml --- r: 261707 b: refs/heads/master c: f6e7605 h: refs/heads/master i: 261705: 8104a01 261703: f7efe98 v: v3
git-mirror · Jul 27, 2011 · d83bd28 · d83bd28
1 parent e215aa5
commit d83bd28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fec62c368b9c8b05d5124ca6c3b8336b537f26f3
+refs/heads/master: f6e76055ba778c56716ba79e106db28297775e87
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
@@ -1219,8 +1219,8 @@ static void complete_scsi_command(struct CommandList *cp)
 		dev_warn(&h->pdev->dev, "cp %p reports abort failed\n", cp);
 		break;
 	case CMD_UNSOLICITED_ABORT:
-		cmd->result = DID_RESET << 16;
-		dev_warn(&h->pdev->dev, "cp %p aborted do to an unsolicited "
+		cmd->result = DID_SOFT_ERROR << 16; /* retry the command */
+		dev_warn(&h->pdev->dev, "cp %p aborted due to an unsolicited "
 			"abort\n", cp);
 		break;
 	case CMD_TIMEOUT: