---

yaml --- r: 88495 b: refs/heads/master c: c1702be h: refs/heads/master i: 88493: 53f6d4b 88491: 87a5b9c 88487: bc28ba5 88479: e9611c5 v: v3
git-mirror · Apr 17, 2008 · e595147 · e595147
1 parent 0d66e73
commit e595147
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b84888215310002e3d266d5a7fe458bb224f6881
+refs/heads/master: c1702be20fd44f4c878a182be1559c2242916820
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_iba6120.c b/trunk/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -481,7 +481,7 @@ static void ipath_pe_handle_hwerrors(struct ipath_devdata *dd, char *msg,
 			      (hwerrs & ~dd->ipath_hwe_bitsextant));
 
 	ctrl = ipath_read_kreg32(dd, dd->ipath_kregs->kr_control);
-	if (ctrl & INFINIPATH_C_FREEZEMODE) {
+	if ((ctrl & INFINIPATH_C_FREEZEMODE) && !ipath_diag_inuse) {
 		/*
 		 * parity errors in send memory are recoverable,
 		 * just cancel the send (if indicated in * sendbuffererror),