Index: dev/ic/wdc.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/wdc.c,v
retrieving revision 1.93
diff -u -r1.93 wdc.c
--- dev/ic/wdc.c	2006/05/22 05:21:57	1.93
+++ dev/ic/wdc.c	2007/05/11 15:43:17
@@ -1165,7 +1165,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);
@@ -1180,8 +1180,8 @@
 		if ((status & WDCS_BSY) == 0 && (status & mask) == bits)
 			break;
 		if (++time > timeout) {
-			WDCDEBUG_PRINT(("wdcwait: timeout, status 0x%b "
-			    "error 0x%x\n", status, WDCS_BITS,
+			WDCDEBUG_PRINT(("wdcwait: timeout %d status 0x%b "
+			    "error 0x%x\n", timeout, status, WDCS_BITS,
 			    CHP_READ_REG(chp, wdr_error)),
 			    DEBUG_STATUSX | DEBUG_STATUS);
 			return -1;