diff options
| author | Nick Hibma <n_hibma@FreeBSD.org> | 1998-12-12 11:30:04 +0000 |
|---|---|---|
| committer | Nick Hibma <n_hibma@FreeBSD.org> | 1998-12-12 11:30:04 +0000 |
| commit | b3f65f42c092dd4fb20b43a476e2e4faa7e1c753 (patch) | |
| tree | 3428ababde1c9c1518e06070cd8684c1b5648c04 | |
| parent | 69acd21dfd4d320496e1345b821009802be59c6f (diff) | |
Notes
| -rw-r--r-- | sys/kern/subr_bus.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 50eb4d79bef7..d5f2c58f3212 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]); |