diff options
| author |   stsp <stsp@openbsd.org> | 2015-07-09 16:33:42 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2015-07-09 16:33:42 +0000 |
| commit | 57392abc44f4226402d00dd1c944131c3dd85911 (patch) | |
| tree | bf06e1e653f46239c9d269c009237b312aaa221c | |
| parent | Set f_hostname to NULL after free() to avoid a double free when (diff) | |
| download | wireguard-openbsd-57392abc44f4226402d00dd1c944131c3dd85911.tar.xz wireguard-openbsd-57392abc44f4226402d00dd1c944131c3dd85911.zip | |
Revert previous, doesn't fix anything. I managed to reproduce
the problem on one of my machines and the patch doesn't help.
See http://marc.info/?l=openbsd-tech&m=143645936727569&w=2
| -rw-r--r-- | sys/dev/usb/if_athn_usb.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c index ba3991496c9..f16c6632003 100644 --- a/sys/dev/usb/if_athn_usb.c +++ b/sys/dev/usb/if_athn_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_usb.c,v 1.35 2015/07/09 13:48:54 stsp Exp $ */ +/* $OpenBSD: if_athn_usb.c,v 1.36 2015/07/09 16:33:42 stsp Exp $ */ /*- * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr> @@ -302,8 +302,7 @@ athn_usb_attachhook(void *xsc) /* Load firmware. */ error = athn_usb_load_firmware(usc); if (error != 0) { - printf("%s: could not load firmware (error %d)\n", - sc->sc_dev.dv_xname, error); + printf("%s: could not load firmware\n", sc->sc_dev.dv_xname); return; } @@ -680,9 +679,9 @@ athn_usb_load_firmware(struct athn_usb_softc *usc) s = splusb(); usc->wait_msg_id = AR_HTC_MSG_READY; error = usbd_do_request(usc->sc_udev, &req, NULL); - /* Wait at most 2 seconds for firmware to boot. */ + /* Wait at most 1 second for firmware to boot. */ if (error == 0 && usc->wait_msg_id != 0) - error = tsleep(&usc->wait_msg_id, 0, "athnfw", 2 * hz); + error = tsleep(&usc->wait_msg_id, 0, "athnfw", hz); usc->wait_msg_id = 0; splx(s); return (error); |