From 0f2c7f2a52571de6dbdf1f0a8e6d7eaadec528d6 Mon Sep 17 00:00:00 2001 From: thompsa Date: Sun, 26 Dec 2010 18:15:57 +0000 Subject: [PATCH] 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) git-svn-id: svn://svn.freebsd.org/base/releng/8.2@216720 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/dev/usb/usb_request.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/usb/usb_request.c b/sys/dev/usb/usb_request.c index 4947ed24..dfb9b4cd 100644 --- a/sys/dev/usb/usb_request.c +++ b/sys/dev/usb/usb_request.c @@ -793,6 +793,10 @@ usbd_req_reset_port(struct usb_device *udev, struct mtx *mtx, uint8_t port) 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; -- 2.42.0