From ffe4d2f7c7cd89310b225d0efaef02a440dec30d Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Tue, 26 Feb 2002 16:17:45 +0000
Subject: [PATCH] Fixed 3 regressions in rev.1.99 (clobbering of the English
 fix in rev.1.98, and 2 unformattings).

---
 sys/kern/subr_bus.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index e190f2047b7a..3f451d38b235 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -359,10 +359,11 @@ devclass_alloc_unit(devclass_t dc, int *unitp)
 	/* If we were given a wired unit number, check for existing device */
 	/* XXX imp XXX */
 	if (unit != -1) {
-		if (unit >= 0 && unit < dc->maxunit && dc->devices[unit]) {
+		if (unit >= 0 && unit < dc->maxunit &&
+		    dc->devices[unit] != NULL) {
 			if (bootverbose)
-				printf("%s: %s%d already exists, skipping it\n",
-			    		dc->name, dc->name, *unitp);
+				printf("%s: %s%d already exists; skipping it\n",
+				    dc->name, dc->name, *unitp);
 			return (EEXIST);
 		}
 	} else {