From fc4ab8dcbed1a3522e476e74ecdc7e1a4fb91bad Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Sun, 13 Jan 2008 14:04:16 +0900
Subject: [PATCH] --- yaml --- r: 75481 b: refs/heads/master c:
 c2e14f11120bbef0c883e795da8180b58f3cddae h: refs/heads/master i:   75479:
 7f5b3c580ca4a57062862656566c7f3a8ddad15e v: v3

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

diff --git a/[refs] b/[refs]
index 85cb017df67d..52ffef45c08b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7293fa8fb74f17077a2ac7ccd5b58ae3225317d0
+refs/heads/master: c2e14f11120bbef0c883e795da8180b58f3cddae
diff --git a/trunk/drivers/ata/sata_sil24.c b/trunk/drivers/ata/sata_sil24.c
index d9c8b32b483c..864c1c1b8511 100644
--- a/trunk/drivers/ata/sata_sil24.c
+++ b/trunk/drivers/ata/sata_sil24.c
@@ -1094,10 +1094,13 @@ static void sil24_error_intr(struct ata_port *ap)
 		if (ci && ci->desc) {
 			err_mask |= ci->err_mask;
 			action |= ci->action;
+			if (action & ATA_EH_RESET_MASK)
+				freeze = 1;
 			ata_ehi_push_desc(ehi, "%s", ci->desc);
 		} else {
 			err_mask |= AC_ERR_OTHER;
 			action |= ATA_EH_SOFTRESET;
+			freeze = 1;
 			ata_ehi_push_desc(ehi, "unknown command error %d",
 					  cerr);
 		}