From 58cf667f4661619fbec5f7b879bd331fdc46760c Mon Sep 17 00:00:00 2001
From: Brian King <brking@linux.vnet.ibm.com>
Date: Thu, 29 Mar 2007 12:43:17 -0500
Subject: [PATCH] --- yaml --- r: 53686 b: refs/heads/master c:
 24d6f2b50bd34d0da540a9e6f71c4b6ab25f4b93 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/scsi/ipr.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index be33c3d5f12d..3317720354e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0692dd4d7e90ce5cf1241731c6e80118402e3b4
+refs/heads/master: 24d6f2b50bd34d0da540a9e6f71c4b6ab25f4b93
diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c
index 44ce9f5218a8..fc1171c7def4 100644
--- a/trunk/drivers/scsi/ipr.c
+++ b/trunk/drivers/scsi/ipr.c
@@ -3846,6 +3846,8 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)
 		if (ipr_cmd->ioarcb.res_handle == res->cfgte.res_handle) {
 			if (ipr_cmd->scsi_cmd)
 				ipr_cmd->done = ipr_scsi_eh_done;
+			if (ipr_cmd->qc)
+				ipr_cmd->done = ipr_sata_eh_done;
 			if (ipr_cmd->qc && !(ipr_cmd->qc->flags & ATA_QCFLAG_FAILED)) {
 				ipr_cmd->qc->err_mask |= AC_ERR_TIMEOUT;
 				ipr_cmd->qc->flags |= ATA_QCFLAG_FAILED;