summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2007-12-21 17:36:52 +0000
committerkettenis <kettenis@openbsd.org>2007-12-21 17:36:52 +0000
commit2603de37e3b276adc2c69c92b927ad8db043c012 (patch)
tree3966af85bdff58e1f6dc9c2ece9e663b6a220e05
parenta few nits (diff)
downloadwireguard-openbsd-2603de37e3b276adc2c69c92b927ad8db043c012.tar.xz
wireguard-openbsd-2603de37e3b276adc2c69c92b927ad8db043c012.zip
Don't panic if someone inserts a CardBus slot for which we disabled CardBus
support; print a properly formatted message instead. ok jsing@
-rw-r--r--sys/dev/cardbus/cardslot.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c
index 78d0ad61187..101f3671223 100644
--- a/sys/dev/cardbus/cardslot.c
+++ b/sys/dev/cardbus/cardslot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cardslot.c,v 1.9 2007/12/16 13:46:36 kettenis Exp $ */
+/* $OpenBSD: cardslot.c,v 1.10 2007/12/21 17:36:52 kettenis Exp $ */
/* $NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $ */
/*
@@ -318,7 +318,8 @@ cardslot_event_thread(void *arg)
CARDSLOT_STATUS_NOTWORK);
}
} else {
- panic("no cardbus on %s", sc->sc_dev.dv_xname);
+ printf("%s: CardBus support disabled\n",
+ sc->sc_dev.dv_xname);
}
break;