summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-09-27 19:35:18 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-09-27 19:35:18 +0000
commit3703b32f4e77a6abf1552c657e08ecbd494068e1 (patch)
tree035b805d4ffb6990fe26fd7ff44a219fa73544da /sys
parent10506bfdc7487c52a0f8393bef63a03c366ef54d (diff)
- do not bother printing the attach error message from the attach hook
if pgt_attach() fails. - remove pgt_disable/pgt_reboot from the pgt_attach error path, just return for now. ok mglocker@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/pgt.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index a2d3c739a6c..49b6b4a7c8a 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pgt.c,v 1.15 2006/09/26 21:32:49 mglocker Exp $ */
+/* $OpenBSD: pgt.c,v 1.16 2006/09/27 19:35:17 brad Exp $ */
/*
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -208,13 +208,8 @@ void
pgt_attachhook(void *xsc)
{
struct pgt_softc *sc = xsc;
- int error;
- error = pgt_attach(sc);
- if (error) {
- printf("%s: attach error\n", sc->sc_dev.dv_xname);
- return;
- }
+ pgt_attach(sc);
}
void
@@ -643,11 +638,6 @@ pgt_attach(struct pgt_softc *sc)
ieee80211_new_state(&sc->sc_ic, IEEE80211_S_INIT, -1);
failed:
- if (error) {
- pgt_disable(sc, SC_DYING);
- pgt_reboot(sc);
- }
-
return (error);
}