Module Name: src
Committed By: jakllsch
Date: Fri Mar 9 00:12:11 UTC 2012
Modified Files:
src/sys/dev/usb: uhub.c
Log Message:
Restore parts of uhub_explore() needed to make usb_needs_reattach() work.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/usb/uhub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uhub.c
diff -u src/sys/dev/usb/uhub.c:1.115 src/sys/dev/usb/uhub.c:1.116
--- src/sys/dev/usb/uhub.c:1.115 Mon Mar 5 16:14:03 2012
+++ src/sys/dev/usb/uhub.c Fri Mar 9 00:12:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.115 2012/03/05 16:14:03 sborrill Exp $ */
+/* $NetBSD: uhub.c,v 1.116 2012/03/09 00:12:10 jakllsch Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.115 2012/03/05 16:14:03 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.116 2012/03/09 00:12:10 jakllsch Exp $");
#include "opt_usb.h"
@@ -464,8 +464,12 @@ uhub_explore(usbd_device_handle dev)
/* XXX handle overcurrent and resume events! */
- if (!(change & UPS_C_CONNECT_STATUS))
+ if (!reconnect && !(change & UPS_C_CONNECT_STATUS)) {
+ /* No status change, just do recursive explore. */
+ if (up->device != NULL && up->device->hub != NULL)
+ up->device->hub->explore(up->device);
continue;
+ }
/* We have a connect status change, handle it. */
