diff options
author | Tom Rini <trini@konsulko.com> | 2020-04-10 11:40:28 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-04-10 11:40:28 -0400 |
commit | 995972ddbbcc5fccd324ab384bca9af90e710755 (patch) | |
tree | 8d5373632f804e0d6ef2795bf74026183b8781de | |
parent | a7ae587f9325aa072617dae109d474f623b38a3e (diff) | |
parent | 28888ca38ecc1c427d41db92c624cbf6d343df74 (diff) |
Merge tag 'dm-pull9apr20' of git://git.denx.de/u-boot-dm
Fixes segfault in 'dm drivers' command
-rw-r--r-- | drivers/core/dump.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/core/dump.c b/drivers/core/dump.c index b5046398d4..cb8a25b9ad 100644 --- 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); } } |