--- dev/ic/wdc.c-	Tue Apr 11 16:07:30 2000
+++ dev/ic/wdc.c	Wed Jun 28 13:46:52 2000
@@ -892,7 +892,9 @@
 	    :"none", chp->channel), DEBUG_STATUS);
 	chp->ch_error = 0;
 
+#if 0
 	timeout = timeout * 1000 / WDCDELAY; /* delay uses microseconds */
+#endif
 
 	for (;;) {
 #ifdef TEST_ALTSTS
@@ -912,9 +914,9 @@
 		}
 		if ((status & WDCS_BSY) == 0 && (status & mask) == bits) 
 			break;
-		if (++time > timeout) {
-			WDCDEBUG_PRINT(("wdcwait: timeout, status %x "
-			    "error %x\n", status,
+		if (++time > 10000 * 1000 / WDCDELAY) {
+			WDCDEBUG_PRINT(("wdcwait: timeout %d status %x "
+			    "error %x\n", timeout, status,
 			    CHP_READ_REG(chp, wdr_error)),
 			    DEBUG_STATUSX | DEBUG_STATUS); 
 			return -1;