summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/usb_dev.c
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-06-09 19:14:27 +0000
committerdim <dim@FreeBSD.org>2015-06-09 19:14:27 +0000
commit6370dd4a2cfcd7b1e323f780f34523097a892d0c (patch)
tree16a54540a7fb71a7c91fd866ad2437410acbf587 /sys/dev/usb/usb_dev.c
parent8c2b6d93700b452fac3cadba57de1b18a783ec92 (diff)
parent8fbb8a1dd51626b81ee23212d3001e3908ff17c4 (diff)
downloadFreeBSD-src-6370dd4a2cfcd7b1e323f780f34523097a892d0c.zip
FreeBSD-src-6370dd4a2cfcd7b1e323f780f34523097a892d0c.tar.gz
Merged ^/head r283871 through r284187.
Diffstat (limited to 'sys/dev/usb/usb_dev.c')
-rw-r--r--sys/dev/usb/usb_dev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c
index 1076a9f..c48bfc9 100644
--- a/sys/dev/usb/usb_dev.c
+++ b/sys/dev/usb/usb_dev.c
@@ -830,7 +830,8 @@ usb_fifo_close(struct usb_fifo *f, int fflags)
(!f->flag_iserror)) {
/* wait until all data has been written */
f->flag_sleeping = 1;
- err = cv_wait_sig(&f->cv_io, f->priv_mtx);
+ err = cv_timedwait_sig(&f->cv_io, f->priv_mtx,
+ USB_MS_TO_TICKS(USB_DEFAULT_TIMEOUT));
if (err) {
DPRINTF("signal received\n");
break;
OpenPOWER on IntegriCloud