summaryrefslogtreecommitdiffstats
path: root/sys/dev/isa
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2010-07-02 02:29:45 +0000
committertedu <tedu@openbsd.org>2010-07-02 02:29:45 +0000
commitbefcd6d1f79c5ef4977a90c2979b20c34c5bc35c (patch)
treea01e61672bb51208753a53c68a9eb1ff32ee31c3 /sys/dev/isa
parentfix corrupt UVMHIST_LOG (diff)
downloadwireguard-openbsd-befcd6d1f79c5ef4977a90c2979b20c34c5bc35c.tar.xz
wireguard-openbsd-befcd6d1f79c5ef4977a90c2979b20c34c5bc35c.zip
some very obvious uninit bugs found when I turned off -Wno-uninitialized
ok deraadt
Diffstat (limited to 'sys/dev/isa')
-rw-r--r--sys/dev/isa/aha.c6
-rw-r--r--sys/dev/isa/if_ex.c7
-rw-r--r--sys/dev/isa/wds.c4
3 files changed, 8 insertions, 9 deletions
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 7892fb223d4..646485ed6a7 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aha.c,v 1.71 2010/06/28 18:31:02 krw Exp $ */
+/* $OpenBSD: aha.c,v 1.72 2010/07/02 02:29:45 tedu Exp $ */
/* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */
#undef AHADIAG
@@ -1400,11 +1400,11 @@ aha_timeout(arg)
int s;
s = splbio();
- bus_dmamap_sync(sc->sc_dmat, ccb->ccb_dmam, 0,
- ccb->ccb_dmam->dm_mapsize, BUS_DMASYNC_POSTREAD);
xs = ccb->xs;
sc_link = xs->sc_link;
sc = sc_link->adapter_softc;
+ bus_dmamap_sync(sc->sc_dmat, ccb->ccb_dmam, 0,
+ ccb->ccb_dmam->dm_mapsize, BUS_DMASYNC_POSTREAD);
sc_print_addr(sc_link);
printf("timed out");
diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c
index e9ab96f0532..49eb0775984 100644
--- a/sys/dev/isa/if_ex.c
+++ b/sys/dev/isa/if_ex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ex.c,v 1.35 2008/11/28 02:44:17 brad Exp $ */
+/* $OpenBSD: if_ex.c,v 1.36 2010/07/02 02:29:45 tedu Exp $ */
/*
* Copyright (c) 1997, Donald A. Schmidt
* Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
@@ -564,7 +564,7 @@ ex_intr(void *arg)
struct ex_softc *sc = arg;
struct ifnet *ifp = &sc->arpcom.ac_if;
int int_status, send_pkts;
- int handled;
+ int handled = 0;
DODEBUG(Start_End, printf("exintr: start\n"););
@@ -585,8 +585,7 @@ ex_intr(void *arg)
handled = 1;
ex_tx_intr(sc);
send_pkts = 1;
- } else
- handled = 0;
+ }
}
/*
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 9660b92820b..558cae6bcdf 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wds.c,v 1.36 2010/06/28 18:31:02 krw Exp $ */
+/* $OpenBSD: wds.c,v 1.37 2010/07/02 02:29:45 tedu Exp $ */
/* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */
#undef WDSDIAG
@@ -844,7 +844,7 @@ wds_find(ia, sc)
struct wds_softc *sc;
{
bus_space_tag_t iot = ia->ia_iot;
- bus_space_handle_t ioh;
+ bus_space_handle_t ioh = ia->ia_ioh;
u_char c;
int i;