summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorn_hibma <n_hibma@FreeBSD.org>1998-12-12 11:30:04 +0000
committern_hibma <n_hibma@FreeBSD.org>1998-12-12 11:30:04 +0000
commit1935e1645817b3dd4b6a25935377293a9a72b3bd (patch)
tree37c86359f80505d4b094720a05ed235d545495c3 /sys/kern
parentca6fd0503c7a84c68a40177a7fae7b198583e14e (diff)
downloadFreeBSD-src-1935e1645817b3dd4b6a25935377293a9a72b3bd.zip
FreeBSD-src-1935e1645817b3dd4b6a25935377293a9a72b3bd.tar.gz
When no driver was found for a device, the message 'not probed' appeared
This is odd, especially in the case of USB where the driver is found in several tries: vendor specific, class specific, interface specific. The mouse driver is found at the interface specific level... Reviewed by: Doug Rabson (dfr@freebsd.org)
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/subr_bus.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 50eb4d7..d5f2c58 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: subr_bus.c,v 1.10 1998/11/14 21:58:51 wollman Exp $
+ * $Id: subr_bus.c,v 1.11 1998/11/15 18:11:21 dfr Exp $
*/
#include <sys/param.h>
@@ -810,9 +810,9 @@ device_probe_and_attach(device_t dev)
return 0;
if (dev->flags & DF_ENABLED) {
- device_probe_child(bus, dev);
- device_print_child(bus, dev);
- if (dev->state == DS_ALIVE) {
+ error = device_probe_child(bus, dev);
+ if (!error) {
+ device_print_child(bus, dev);
error = DEVICE_ATTACH(dev);
if (!error)
dev->state = DS_ATTACHED;
@@ -1257,7 +1257,7 @@ driver_module_handler(module_t mod, int what, void *arg)
case MOD_LOAD:
for (i = 0; !error && i < dmd->dmd_ndrivers; i++) {
PDEBUG(("Loading module: driver %s on bus %s",
- DRIVERNAME(dmd->dmd_driver[i]),
+ DRIVERNAME(dmd->dmd_drivers[i]),
dmd->dmd_busname));
error = devclass_add_driver(bus_devclass,
dmd->dmd_drivers[i]);
OpenPOWER on IntegriCloud