summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2007-12-16 13:46:37 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2007-12-16 13:46:37 +0000
commit5480869718c42e5e9c7a27eb6ff062204bab26a4 (patch)
treeccaeb66ee35f1ed910249206ab6549d04400f90d /sys
parent3b8717e227a898eca15ce6c44971204231fbbdb4 (diff)
Don't crash if we only try to attach pcmcia(4).
ok jsing@, fgsch@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/cardbus/cardslot.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c
index f0f1df86fcc..78d0ad61187 100644
--- a/sys/dev/cardbus/cardslot.c
+++ b/sys/dev/cardbus/cardslot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cardslot.c,v 1.8 2007/09/17 20:29:47 miod Exp $ */
+/* $OpenBSD: cardslot.c,v 1.9 2007/12/16 13:46:36 kettenis Exp $ */
/* $NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $ */
/*
@@ -101,8 +101,8 @@ cardslotattach(struct device *parent, struct device *self, void *aux)
struct cbslot_attach_args *cba = caa->caa_cb_attach;
struct pcmciabus_attach_args *pa = caa->caa_16_attach;
- struct cardbus_softc *csc;
- struct pcmcia_softc *psc;
+ struct cardbus_softc *csc = NULL;
+ struct pcmcia_softc *psc = NULL;
sc->sc_slot = sc->sc_dev.dv_unit;
sc->sc_cb_softc = NULL;