summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBurt P <pburt0@gmail.com>2017-07-21 23:10:22 -0500
committerLeandro A. F. Pereira <leandro@hardinfo.org>2017-07-22 14:24:27 -0700
commitca4a9ce41de942241b6a26ad83a5218d2d735b2e (patch)
tree024666705a3296538902c2f86d486cccd467dde8
parent4ece9935e89b9e4fbc36940e6bc2f8d3fbb43f45 (diff)
device tree: fix bug in dtr_get_parent_obj()
Signed-off-by: Burt P <pburt0@gmail.com>
-rw-r--r--includes/dt_util.h2
-rw-r--r--modules/devices/devicetree/dt_util.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/includes/dt_util.h b/includes/dt_util.h
index 533bc314..5f016f2f 100644
--- a/includes/dt_util.h
+++ b/includes/dt_util.h
@@ -6,7 +6,7 @@
/* some not-quite-complete stuff that can be disabled */
#define DTEX_PHREFS 1
-#define DTEX_MTUP 0
+#define DTEX_MTUP 1
#ifndef DTR_ROOT
#define DTR_ROOT dtr_find_device_tree_root()
diff --git a/modules/devices/devicetree/dt_util.c b/modules/devices/devicetree/dt_util.c
index 75baff13..de371da2 100644
--- a/modules/devices/devicetree/dt_util.c
+++ b/modules/devices/devicetree/dt_util.c
@@ -743,10 +743,9 @@ dtr_obj *dtr_get_parent_obj(dtr_obj *obj) {
*slash = 0;
if (strlen(parent) > 0)
ret = dtr_obj_read(obj->dt, parent);
- } else if (strlen(parent) > 1) {
- ret = dtr_obj_read(obj->dt, "/");
+ else
+ ret = dtr_obj_read(obj->dt, "/");
}
-
free(parent);
return ret;
}