Date: Fri, 5 Jun 2015 06:06:07 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284011 - head/sys/dev/usb Message-ID: <201506050606.t55667v4087502@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506050606.t55667v4087502>