svn commit: r284011 - head/sys/dev/usb

[Hans Petter Selasky]

Author: hselasky
Date: Fri Jun  5 06:06:07 2015
New Revision: 284011
URL: https://svnweb.freebsd.org/changeset/base/284011

Log:
  Don't wait forever for USB data to be flushed.
  
  MFC after:	1 week

Modified:
  head/sys/dev/usb/usb_dev.c

Modified: head/sys/dev/usb/usb_dev.c
==============================================================================
--- head/sys/dev/usb/usb_dev.c	Fri Jun  5 02:22:04 2015	(r284010)
+++ head/sys/dev/usb/usb_dev.c	Fri Jun  5 06:06:07 2015	(r284011)
@@ -830,7 +830,8 @@ usb_fifo_close(struct usb_fifo *f, int f
 			    (!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;