Merge tag 'dm-pull9apr20' of git://git.denx.de/u-boot-dm

Fixes segfault in 'dm drivers' command

diff --git a/drivers/core/dump.c b/drivers/core/dump.c
index b5046398d4c6664ca4edd42ea1ec148b8befc3e2..cb8a25b9ad63be91dc63b9f3c117b05235563737 100644 (file)
--- a/drivers/core/dump.c
+++ b/drivers/core/dump.c
@@ -107,12 +107,16 @@ void dm_dump_drivers(void)
        puts("Driver                Compatible\n");
        puts("--------------------------------\n");
        for (entry = d; entry < d + n_ents; entry++) {
-               for (match = entry->of_match;
-                    match && match->compatible; match++)
-                       printf("%-20.20s  %s\n",
-                              match == entry->of_match ? entry->name : "",
-                              match->compatible);
-               if (match == entry->of_match)
-                       printf("%-20.20s\n", entry->name);
+               match = entry->of_match;
+
+               printf("%-20.20s", entry->name);
+               if (match) {
+                       printf("  %s", match->compatible);
+                       match++;
+               }
+               printf("\n");
+
+               for (; match && match->compatible; match++)
+                       printf("%-20.20s  %s\n", "", match->compatible);
        }
 }