summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2013-11-07 10:16:27 +0000
committermpi <mpi@openbsd.org>2013-11-07 10:16:27 +0000
commite9146d2a8b3603f3260af43a61559b0ca6609c6d (patch)
tree18391871d35bdeaed13eb8498d85f1d9f4d40ce5
parentRemove isoc_len from the transfer descriptor, it is assigned once but (diff)
downloadwireguard-openbsd-e9146d2a8b3603f3260af43a61559b0ca6609c6d.tar.xz
wireguard-openbsd-e9146d2a8b3603f3260af43a61559b0ca6609c6d.zip
Make sure to mark the controller as dying in order to stop processing
any transfer when autoconf(9) asks for it. This brings uhci(4) in sync with ohci(4) and ehci(4). ok pirofti@
-rw-r--r--sys/dev/usb/uhci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 54acb3e0eb7..20b587ae435 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhci.c,v 1.101 2013/11/01 17:29:01 mpi Exp $ */
+/* $OpenBSD: uhci.c,v 1.102 2013/11/07 10:16:27 mpi Exp $ */
/* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
@@ -580,6 +580,7 @@ uhci_activate(struct device *self, int act)
case DVACT_DEACTIVATE:
if (sc->sc_child != NULL)
rv = config_deactivate(sc->sc_child);
+ sc->sc_bus.dying = 1;
break;
}
return (rv);