summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2004-06-28 03:40:23 +0000
committerimp <imp@FreeBSD.org>2004-06-28 03:40:23 +0000
commitd334c4b305e2d01f49cbf0e89db7b3dd763cd524 (patch)
treee145214e71152a1bfe9e6f469373e69b0775fd5d
parentc0e6c73704f39e916c12ce6fce530bfa50987ed0 (diff)
downloadFreeBSD-src-d334c4b305e2d01f49cbf0e89db7b3dd763cd524.zip
FreeBSD-src-d334c4b305e2d01f49cbf0e89db7b3dd763cd524.tar.gz
Turns out that jhb didn't really like this. And nate pointed out that
it wasn't a good idea to have the test for NULL on only a limited subset. Go back because I'm not sure adding NULL to all the others is a good idea.
-rw-r--r--sys/kern/subr_bus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 10ad909..fd2e9d4 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -1587,13 +1587,13 @@ device_is_enabled(device_t dev)
int
device_is_alive(device_t dev)
{
- return (dev != NULL && dev->state >= DS_ALIVE);
+ return (dev->state >= DS_ALIVE);
}
int
device_is_attached(device_t dev)
{
- return (dev != NULL && dev->state >= DS_ATTACHED);
+ return (dev->state >= DS_ATTACHED);
}
int
OpenPOWER on IntegriCloud