Author: thompsa
Date: Sun Dec 26 18:15:18 2010
New Revision: 216718
URL: http://svn.freebsd.org/changeset/base/216718
Log:
MFC r216249
Re-add a status check which sneaked out during r214804.
This change can fix some USB error messages showing up
during bootup.
Approved by: re (kib)
Modified:
stable/8/sys/dev/usb/usb_request.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/usb/usb_request.c
==============================================================================
--- stable/8/sys/dev/usb/usb_request.c Sun Dec 26 18:12:13 2010
(r216717)
+++ stable/8/sys/dev/usb/usb_request.c Sun Dec 26 18:15:18 2010
(r216718)
@@ -793,6 +793,10 @@ usbd_req_reset_port(struct usb_device *u
if (err) {
goto done;
}
+ /* if the device disappeared, just give up */
+ if (!(UGETW(ps.wPortStatus) & UPS_CURRENT_CONNECT_STATUS)) {
+ goto done;
+ }
/* check if reset is complete */
if (UGETW(ps.wPortChange) & UPS_C_PORT_RESET) {
break;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
