summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjakemsr <jakemsr@openbsd.org>2010-12-15 00:59:26 +0000
committerjakemsr <jakemsr@openbsd.org>2010-12-15 00:59:26 +0000
commit0d45a19bb08c4aae73bddccfa865865c9c21bde1 (patch)
tree3fe682ab3dfcc3febbf87210ff5ba809abc4501a
parentfix ControlMaster=ask regression (diff)
downloadwireguard-openbsd-0d45a19bb08c4aae73bddccfa865865c9c21bde1.tar.xz
wireguard-openbsd-0d45a19bb08c4aae73bddccfa865865c9c21bde1.zip
don't delay if the device is dying
ok krw@
-rw-r--r--sys/dev/usb/usb_subr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index cbd7e6c77f0..9dc23999599 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_subr.c,v 1.75 2010/12/06 04:30:57 jakemsr Exp $ */
+/* $OpenBSD: usb_subr.c,v 1.76 2010/12/15 00:59:26 jakemsr Exp $ */
/* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
@@ -351,6 +351,9 @@ usb_delay_ms(usbd_bus_handle bus, u_int ms)
void
usbd_delay_ms(usbd_device_handle dev, u_int ms)
{
+ if (usbd_is_dying(dev))
+ return;
+
usb_delay_ms(dev->bus, ms);
}