diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-05-18 17:10:28 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-05-18 17:10:28 +0000 |
| commit | 1e415c18717f1b7716f404d580bb7d2fe6abfd76 (patch) | |
| tree | c7ca3a56c85b552ff6816cb618bf257629018b95 /sys/dev/usb/uhcivar.h | |
| parent | 58a1099b1ac7a621a8eedf102ef167e77d76a6d8 (diff) | |
Do not pass an xfer pointer to the timeout routine checking for root hub
status changes because it might be freed when detaching the root uhub(4).
Also do not reschedule a timeout if the pipe is being aborted.
Finally do not add more code to retrieve the 'bInterval' value of the
root hub endpoint descriptor since this value is hardcoded in the uhci(4)
driver.
Diffstat (limited to 'sys/dev/usb/uhcivar.h')
| -rw-r--r-- | sys/dev/usb/uhcivar.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h index 8e4c45c11f0..77801bba836 100644 --- a/sys/dev/usb/uhcivar.h +++ b/sys/dev/usb/uhcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uhcivar.h,v 1.32 2014/05/16 18:17:03 mpi Exp $ */ +/* $OpenBSD: uhcivar.h,v 1.33 2014/05/18 17:10:27 mpi Exp $ */ /* $NetBSD: uhcivar.h,v 1.36 2002/12/31 00:39:11 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.14 1999/11/17 22:33:42 n_hibma Exp $ */ @@ -151,9 +151,8 @@ struct uhci_softc { LIST_HEAD(, uhci_xfer) sc_intrhead; /* Info for the root hub interrupt "pipe". */ - int sc_ival; /* time between root hub intrs */ - struct usbd_xfer *sc_intr_xfer; /* root hub interrupt transfer */ - struct timeout sc_poll_handle; + struct usbd_xfer *sc_intrxfer; + struct timeout sc_root_intr; char sc_vendor[32]; /* vendor string for root hub */ int sc_id_vendor; /* vendor ID for root hub */ |