---

yaml --- r: 75481 b: refs/heads/master c: c2e14f1 h: refs/heads/master i: 75479: 7f5b3c5 v: v3
git-mirror · Jan 15, 2008 · fc4ab8d · fc4ab8d
1 parent da40c5e
commit fc4ab8d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);
 		}