summaryrefslogtreecommitdiffstats
path: root/freebsd/sys/kern/subr_bus.c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-11-06 09:35:05 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-11-11 10:08:06 +0100
commit0a57e1db23218393483a356c07868413a45caeeb (patch)
treea2d1dd67f5b05a52b1f79f571c690ebcf299d775 /freebsd/sys/kern/subr_bus.c
parentChange license to BSD (diff)
downloadrtems-libbsd-0a57e1db23218393483a356c07868413a45caeeb.tar.bz2
Reduce divergence from FreeBSD sources
Diffstat (limited to 'freebsd/sys/kern/subr_bus.c')
-rw-r--r--freebsd/sys/kern/subr_bus.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/freebsd/sys/kern/subr_bus.c b/freebsd/sys/kern/subr_bus.c
index f476951c..3d1bd2bc 100644
--- a/freebsd/sys/kern/subr_bus.c
+++ b/freebsd/sys/kern/subr_bus.c
@@ -608,6 +608,7 @@ devctl_queue_data_f(char *data, int flags)
psignal(p, SIGIO);
PROC_UNLOCK(p);
}
+ return;
#else /* __rtems__ */
printf("devctl: %s", data);
#endif /* __rtems__ */
@@ -2269,10 +2270,6 @@ device_get_children(device_t dev, device_t **devlistp, int *devcountp)
return (0);
}
-#ifdef __rtems__
- /* malloc(0) may return NULL */
- if (count != 0) {
-#endif /* __rtems__ */
list = malloc(count * sizeof(device_t), M_TEMP, M_NOWAIT|M_ZERO);
if (!list)
return (ENOMEM);
@@ -2282,11 +2279,6 @@ device_get_children(device_t dev, device_t **devlistp, int *devcountp)
list[count] = child;
count++;
}
-#ifdef __rtems__
- } else {
- list = NULL;
- }
-#endif /* __rtems__ */
*devlistp = list;
*devcountp = count;