summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2007-12-21 17:36:53 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2007-12-21 17:36:53 +0000
commit36357595a16c7eae4c59a733d65195a9c78a2b43 (patch)
tree30db8cae04fc25dea681459a77468f6cfbd33367 /sys
parentec6f3dbeb0ed74a458fa3c4ae5663fd85e48692b (diff)
Don't panic if someone inserts a CardBus slot for which we disabled CardBus
support; print a properly formatted message instead. ok jsing@
Diffstat (limited to 'sys')
-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;