summaryrefslogtreecommitdiffstats
path: root/sys/kern/subr_bus.c
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2002-02-26 16:17:45 +0000
committerbde <bde@FreeBSD.org>2002-02-26 16:17:45 +0000
commit4446cd5261150f93a54923649f011de1d4f36197 (patch)
treedb0e07136feee9a3e867fa5832361aeceeddcc89 /sys/kern/subr_bus.c
parent4de8d802ca7cfdaadfe54caf5a4fe43358480e2c (diff)
downloadFreeBSD-src-4446cd5261150f93a54923649f011de1d4f36197.zip
FreeBSD-src-4446cd5261150f93a54923649f011de1d4f36197.tar.gz
Fixed 3 regressions in rev.1.99 (clobbering of the English fix in rev.1.98,
and 2 unformattings).
Diffstat (limited to 'sys/kern/subr_bus.c')
-rw-r--r--sys/kern/subr_bus.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index e190f20..3f451d3 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 {
OpenPOWER on IntegriCloud