diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/ehci.c | 11 | ||||
| -rw-r--r-- | sys/dev/usb/uhci.c | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index f750348694f..974083b0de7 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.100 2009/06/02 23:49:33 deraadt Exp $ */ +/* $OpenBSD: ehci.c,v 1.101 2009/07/24 08:15:38 blambert Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -3235,7 +3235,7 @@ ehci_device_request(usbd_xfer_handle xfer) if (xfer->timeout && !sc->sc_bus.use_polling) { timeout_del(&xfer->timeout_handle); timeout_set(&xfer->timeout_handle, ehci_timeout, xfer); - timeout_add(&xfer->timeout_handle, mstohz(xfer->timeout)); + timeout_add_msec(&xfer->timeout_handle, xfer->timeout); } ehci_add_intr_list(sc, exfer); xfer->status = USBD_IN_PROGRESS; @@ -3347,7 +3347,7 @@ ehci_device_bulk_start(usbd_xfer_handle xfer) if (xfer->timeout && !sc->sc_bus.use_polling) { timeout_del(&xfer->timeout_handle); timeout_set(&xfer->timeout_handle, ehci_timeout, xfer); - timeout_add(&xfer->timeout_handle, mstohz(xfer->timeout)); + timeout_add_msec(&xfer->timeout_handle, xfer->timeout); } ehci_add_intr_list(sc, exfer); xfer->status = USBD_IN_PROGRESS; @@ -3522,7 +3522,7 @@ ehci_device_intr_start(usbd_xfer_handle xfer) if (xfer->timeout && !sc->sc_bus.use_polling) { timeout_del(&xfer->timeout_handle); timeout_set(&xfer->timeout_handle, ehci_timeout, xfer); - timeout_add(&xfer->timeout_handle, mstohz(xfer->timeout)); + timeout_add_msec(&xfer->timeout_handle, xfer->timeout); } ehci_add_intr_list(sc, exfer); xfer->status = USBD_IN_PROGRESS; @@ -3623,8 +3623,7 @@ ehci_device_intr_done(usbd_xfer_handle xfer) if (xfer->timeout && !sc->sc_bus.use_polling) { timeout_del(&xfer->timeout_handle); timeout_set(&xfer->timeout_handle, ehci_timeout, xfer); - timeout_add(&xfer->timeout_handle, - mstohz(xfer->timeout)); + timeout_add_msec(&xfer->timeout_handle, xfer->timeout); } splx(s); diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 7a2f60a822f..190c3c444aa 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.70 2009/06/02 23:49:33 deraadt Exp $ */ +/* $OpenBSD: uhci.c,v 1.71 2009/07/24 08:15:38 blambert 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 $ */ @@ -1845,7 +1845,7 @@ uhci_device_bulk_start(usbd_xfer_handle xfer) if (xfer->timeout && !sc->sc_bus.use_polling) { timeout_del(&xfer->timeout_handle); timeout_set(&xfer->timeout_handle, uhci_timeout, ii); - timeout_add(&xfer->timeout_handle, mstohz(xfer->timeout)); + timeout_add_msec(&xfer->timeout_handle, xfer->timeout); } xfer->status = USBD_IN_PROGRESS; splx(s); @@ -2270,7 +2270,7 @@ uhci_device_request(usbd_xfer_handle xfer) if (xfer->timeout && !sc->sc_bus.use_polling) { timeout_del(&xfer->timeout_handle); timeout_set(&xfer->timeout_handle, uhci_timeout, ii); - timeout_add(&xfer->timeout_handle, mstohz(xfer->timeout)); + timeout_add_msec(&xfer->timeout_handle, xfer->timeout); } xfer->status = USBD_IN_PROGRESS; splx(s); |