Index: dev/ic/wdc.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/wdc.c,v
retrieving revision 1.42
diff -u -r1.42 wdc.c
--- dev/ic/wdc.c	2001/08/23 13:23:28	1.42
+++ dev/ic/wdc.c	2003/04/28 16:37:37
@@ -982,7 +982,7 @@
 	    :"none", chp->channel), DEBUG_STATUS);
 	chp->ch_error = 0;
 
-	timeout = timeout * 1000 / WDCDELAY; /* delay uses microseconds */
+	timeout = (cold ? timeout : 10000) * 1000 / WDCDELAY;
 
 	for (;;) {
 		chp->ch_status = status = CHP_READ_REG(chp, wdr_status);
@@ -995,8 +995,8 @@
 		if ((status & WDCS_BSY) == 0 && (status & mask) == bits)
 			break;
 		if (++time > timeout) {
-			WDCDEBUG_PRINT(("wdcwait: timeout, status %x "
-			    "error %x\n", status,
+			WDCDEBUG_PRINT(("wdcwait: timeout %d status %x "
+			    "error %x\n", timeout, status,
 			    CHP_READ_REG(chp, wdr_error)),
 			    DEBUG_STATUSX | DEBUG_STATUS); 
 			return -1;