@@ -287,14 +287,15 @@
 #ifdef __NetBSD__
 	if (cold) {
 		i = 50;
-		while (gmbus2 = I915_READ_NOTRACE(GMBUS2 + reg_offset),
-		    !ISSET(gmbus2, (GMBUS_SATOER | gmbus2_status))) {
-			if (i-- == 0)
+		do {
+			gmbus2 = I915_READ_NOTRACE(GMBUS2 + reg_offset);
+			if (ISSET(gmbus2, (GMBUS_SATOER | gmbus2_status)))
 				break;
 			DELAY(1000);
-		}
+		} while (i-- > 0);
 	} else {
-		for (i = 0; i < mstohz(50); i++) {
+		i = mstohz(50);
+		do {
 			int ret;
 
 			spin_lock(&dev_priv->gmbus_wait_lock);
@@ -306,7 +307,9 @@
 				ISSET(gmbus2,
 				    (GMBUS_SATOER | gmbus2_status))));
 			spin_unlock(&dev_priv->gmbus_wait_lock);
-		}
+			if (ret)
+				break;
+		} while (i-- > 0);
 	}
 #else
 	for (i = 0; i < msecs_to_jiffies_timeout(50); i++) {