[src/netbsd-1-5]: src/sys/dev/ic Pull up revision 1.9 (approved by releng-1-5):

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6c70eef704aa
branches:  netbsd-1-5
changeset: 488994:6c70eef704aa
user:      ad <ad%NetBSD.org@localhost>
date:      Wed Aug 09 14:32:44 2000 +0000

description:
Pull up revision 1.9 (approved by releng-1-5):
  Previous would have misbehaved if polled commands overlapped.

diffstat:

 sys/dev/ic/cac.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 46b815ba9ae0 -r 6c70eef704aa sys/dev/ic/cac.c
--- a/sys/dev/ic/cac.c  Wed Aug 09 14:28:30 2000 +0000
+++ b/sys/dev/ic/cac.c  Wed Aug 09 14:32:44 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cac.c,v 1.6.2.1 2000/07/26 11:47:57 ad Exp $   */
+/*     $NetBSD: cac.c,v 1.6.2.2 2000/08/09 14:32:44 ad Exp $   */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.6.2.1 2000/07/26 11:47:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.6.2.2 2000/08/09 14:32:44 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -354,9 +354,10 @@
        int off;
        
        ccb_done = NULL;
+       timo *= 10;
 
        for (;;) {
-               for (timo *= 10, completed = 0; timo != 0; timo--) {
+               for (completed = 0; timo != 0; timo--) {
                        if ((completed = sc->sc_cl->cl_completed(sc)) != 0)
                                break;
                        DELAY(100);