[Qemu-devel] [PATCH] handle all fdt_get_phandle_errors

[Jonathan Marler]

Signed-off-by: Jonathan Marler <johnnymar...@gmail.com>
---
 device_tree.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/device_tree.c b/device_tree.c
index 52c3358..2b75905 100644
--- a/device_tree.c
+++ b/device_tree.c
@@ -379,8 +379,12 @@ uint32_t qemu_fdt_get_phandle(void *fdt, const char
*path)

     r = fdt_get_phandle(fdt, findnode_nofail(fdt, path));
     if (r == 0) {
-        error_report("%s: Couldn't get phandle for %s: %s", __func__,
-                     path, fdt_strerror(r));
+        error_report("%s: Node %s does not have a 'phandle'", __func__,
+                     path);
+        exit(1);
+    }
+    if (r == -1) {
+        error_report("%s: Couldn't get phandle for %s", __func__, path);
         exit(1);
     }

-- 
2.1.4