diff options
| author | Tom Rini <trini@konsulko.com> | 2020-12-23 18:10:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-23 18:10:15 -0500 |
| commit | 958b9e2482538ebfeb2e1161257603d4dec498cb (patch) | |
| tree | 6b9283b58c8684a239d25492c2e8a8b1319be8ca /drivers/core/root.c | |
| parent | 8351a29d2df18c92d8e365cfa848218c3859f3d2 (diff) | |
| parent | ec1add1e51affd4aacc308dc37439ea13dc1b70e (diff) | |
Merge tag 'dm-next-23dec20' of git://git.denx.de/u-boot-dm into next
dm: New sequence number implementation
SPI handling of bus with different-speed devices
patman supression of sign-offs
Diffstat (limited to 'drivers/core/root.c')
| -rw-r--r-- | drivers/core/root.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/core/root.c b/drivers/core/root.c index 672aa7cea72..f2fba5883aa 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -311,22 +311,24 @@ int dm_init_and_scan(bool pre_reloc_only) ret = dm_scan_plat(pre_reloc_only); if (ret) { debug("dm_scan_plat() failed: %d\n", ret); - return ret; + goto fail; } if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) { ret = dm_extended_scan(pre_reloc_only); if (ret) { debug("dm_extended_scan() failed: %d\n", ret); - return ret; + goto fail; } } ret = dm_scan_other(pre_reloc_only); if (ret) - return ret; + goto fail; return 0; +fail: + return ret; } #ifdef CONFIG_ACPIGEN |