[PATCH] tools: ftdgrep: correct the find regions loop in do_fdtgrep

Patrick Delaunay patrick.delaunay at st.com
Fri Jan 10 08:50:31 CET 2020


Update the loop executed in do_fdtgrep to find all the regions
and add a test for count > max_region only when the second passes
is executed.

This patch solve an issue if the number of region found (count)
is greater then the default value (max_region = count = 100):
the second pass is never executed, because the loop stops after
the first pass (i = 0, count > 100, max_regions = 100)
with error -1 and the error message
"Internal error with fdtgrep_find_region".

I also update the error message.

Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
---

 tools/fdtgrep.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
index 8f44f599c1..bcf06b871d 100644
--- a/tools/fdtgrep.c
+++ b/tools/fdtgrep.c
@@ -823,8 +823,10 @@ static int do_fdtgrep(struct display_info *disp, const char *filename)
 		}
 		if (count <= max_regions)
 			break;
+	}
+	if (count > max_regions) {
 		free(region);
-		fprintf(stderr, "Internal error with fdtgrep_find_region)(\n");
+		fprintf(stderr, "Internal error with fdtgrep_find_region()\n");
 		return -1;
 	}
 
-- 
2.17.1



More information about the U-Boot mailing list