summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2006-06-28 04:15:41 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2006-06-28 04:15:41 +0000
commitf3464137375c31d8fc41a99312d59a26f907204b (patch)
treeb74c735ca649468384bb40d53cbc1f3ac074ad54 /sys/dev/usb
parent0d95a156d10736db6af1fb634ed45e2e616bc573 (diff)
Leave usbd_add_drv_event() call till the end of the attach process
to remove the possibility of things like panics due to unitialised timeouts when the usb task runs before we finish attaching.
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/if_zyd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index 7b27ecd4f44..30681d7e280 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_zyd.c,v 1.7 2006/06/28 03:48:46 jsg Exp $ */
+/* $OpenBSD: if_zyd.c,v 1.8 2006/06/28 04:15:40 jsg Exp $ */
/*
* Copyright (c) 2006 by Florian Stoehr <ich@florian-stoehr.de>
@@ -2628,12 +2628,12 @@ zyd_complete_attach(struct zyd_softc *sc)
/* ieee80211_announce(ic);*/
- usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->zyd_udev,
- USBDEV(sc->zyd_dev));
-
timeout_set(&sc->scan_ch, zyd_next_scan, sc);
timeout_add(&sc->scan_ch, hz);
+ usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->zyd_udev,
+ USBDEV(sc->zyd_dev));
+
leave:
DPRINTF(("EXITING complete_attach(): Status = %d\n", rv));
return rv;