From e595147d950f768d7e93e621acc38c203705d9a9 Mon Sep 17 00:00:00 2001 From: Ralph Campbell Date: Wed, 16 Apr 2008 21:01:14 -0700 Subject: [PATCH] --- yaml --- r: 88495 b: refs/heads/master c: c1702be20fd44f4c878a182be1559c2242916820 h: refs/heads/master i: 88493: 53f6d4b2c309f54915bdee796aa434f14e143d1c 88491: 87a5b9c5d391c33885f14b0b4b51cbb8dbe13231 88487: bc28ba5c22bc2f3375ff3f0df2878c327f54aa71 88479: e9611c574151ebb2cc308651f88ec4e418ba0123 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_iba6120.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ca1313b657cc..448a37c2c2fb 100644 --- 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 index f1447be4cfd3..5206b12a7dc0 100644 --- 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),