diff options
| author |   jakemsr <jakemsr@openbsd.org> | 2010-12-06 04:41:39 +0000 |
|---|---|---|
| committer | jakemsr <jakemsr@openbsd.org> | 2010-12-06 04:41:39 +0000 |
| commit | 7b043b62510062c341cef8a30783099e687aaf23 (patch) | |
| tree | 001bda068bc73eac0d3cf7f3317e73f84bc50945 /sys/dev/usb/uhub.c | |
| parent | call config_deactivate() before config_detach() when detaching devices. (diff) | |
| download | wireguard-openbsd-7b043b62510062c341cef8a30783099e687aaf23.tar.xz wireguard-openbsd-7b043b62510062c341cef8a30783099e687aaf23.zip | |
* replace per-driver dying and/or other state variables with use of
usbd_deactivete() and usbd_is_dying()
* use usbd_deactivate() in activate()/DEACTIVATE
* convert a few more direct checks of the associated bus' dying flag
with usbd_is_dying()
Diffstat (limited to 'sys/dev/usb/uhub.c')
| -rw-r--r-- | sys/dev/usb/uhub.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index 75bc3325dee..57d8a0003df 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhub.c,v 1.55 2010/09/23 05:44:15 jakemsr Exp $ */ +/* $OpenBSD: uhub.c,v 1.56 2010/12/06 04:41:40 jakemsr Exp $ */ /* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */ @@ -353,8 +353,8 @@ uhub_explore(usbd_device_handle dev) DPRINTFN(10, ("uhub_explore dev=%p addr=%d\n", dev, dev->address)); - if (dev->bus->dying) { - DPRINTF(("%s: root hub gone at start\n", __func__)); + if (usbd_is_dying(dev)) { + DPRINTF(("%s: dying\n", __func__)); return (USBD_IOERROR); } |