diff --git a/[refs] b/[refs]
index 87d2d633fab4..39290a7cd416 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 273748cc908a901d082b4da5a16b2541c9d78a02
+refs/heads/master: 5f51efc195dfb860c60fafb4e47fe4b7cad2626d
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_iba7220.c b/trunk/drivers/infiniband/hw/ipath/ipath_iba7220.c
index e3ec0d1bdf50..5f693de66542 100644
--- a/trunk/drivers/infiniband/hw/ipath/ipath_iba7220.c
+++ b/trunk/drivers/infiniband/hw/ipath/ipath_iba7220.c
@@ -870,8 +870,9 @@ static int ipath_7220_boardname(struct ipath_devdata *dd, char *name,
 			      "revision %u.%u!\n",
 			      dd->ipath_majrev, dd->ipath_minrev);
 		ret = 1;
-	} else if (dd->ipath_minrev == 1) {
-		/* Rev1 chips are prototype. Complain, but allow use */
+	} else if (dd->ipath_minrev == 1 &&
+		!(dd->ipath_flags & IPATH_INITTED)) {
+		/* Rev1 chips are prototype. Complain at init, but allow use */
 		ipath_dev_err(dd, "Unsupported hardware "
 			      "revision %u.%u, Contact support@qlogic.com\n",
 			      dd->ipath_majrev, dd->ipath_minrev);