diff options
| author | Doug Rabson <dfr@FreeBSD.org> | 1998-11-15 18:11:21 +0000 |
|---|---|---|
| committer | Doug Rabson <dfr@FreeBSD.org> | 1998-11-15 18:11:21 +0000 |
| commit | 921433915d0a8d6ef47c5138af57f688c67fc99e (patch) | |
| tree | a57caf6e5601c4a47a1bb37a8654436b499466d0 | |
| parent | 48a39a495a8dc48d69ba5bd5c7a89d1d4a9e1f9f (diff) | |
Notes
| -rw-r--r-- | sys/kern/subr_bus.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index b40e8b9f401e6..50eb4d79bef70 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.9 1998/11/13 09:39:37 dfr Exp $ + * $Id: subr_bus.c,v 1.10 1998/11/14 21:58:51 wollman Exp $ */ #include <sys/param.h> @@ -420,6 +420,9 @@ devclass_add_device(devclass_t dc, device_t dev) static int devclass_delete_device(devclass_t dc, device_t dev) { + if (!dc || !dev) + return 0; + PDEBUG(("%s in devclass %s", DEVICENAME(dev), DEVCLANAME(dc))); if (dev->devclass != dc @@ -508,7 +511,10 @@ device_add_child(device_t dev, const char *name, int unit, void *ivars) child = make_device(dev, name, unit, ivars); - TAILQ_INSERT_TAIL(&dev->children, child, link); + if (child) + TAILQ_INSERT_TAIL(&dev->children, child, link); + else + PDEBUG(("%s failed", name)); return child; } @@ -798,7 +804,7 @@ int device_probe_and_attach(device_t dev) { device_t bus = dev->parent; - int error; + int error = 0; if (dev->state >= DS_ALIVE) return 0; @@ -822,7 +828,7 @@ device_probe_and_attach(device_t dev) printf("not probed (disabled)\n"); } - return 0; + return error; } int |