sync with 0504 -- prototypes and bus.h

diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 633ea29..6f641f4 100644 (file)
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,5 +1,5 @@
-/*     $OpenBSD: aha.c,v 1.16 1996/05/02 13:31:42 deraadt Exp $        */
-/*     $NetBSD: aha.c,v 1.8 1996/04/25 18:54:45 is Exp $       */
+/*     $OpenBSD: aha.c,v 1.17 1996/05/07 07:51:27 deraadt Exp $        */
+/*     $NetBSD: aha.c,v 1.9 1996/04/29 20:28:40 christos Exp $ */
 
 #define AHADIAG
 #define integrate
@@ -732,11 +732,10 @@ aha_start_ccbs(sc)
        int iobase = sc->sc_iobase;
        struct aha_mbx_out *wmbo;       /* Mail Box Out pointer */
        struct aha_ccb *ccb;
-       int i;
 
        wmbo = wmbx->tmbo;
 
-       while (ccb = sc->sc_waiting_ccb.tqh_first) {
+       while ((ccb = sc->sc_waiting_ccb.tqh_first) != NULL) {
                if (sc->sc_mbofull >= AHA_MBX_SIZE) {
                        aha_collect_mbo(sc);
                        if (sc->sc_mbofull >= AHA_MBX_SIZE) {