diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-22 12:14:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-22 12:14:27 -0400 |
| commit | 55926ddd189546742a4496e6690c2b62958cd7cd (patch) | |
| tree | 737b2eb33d373333dafdcaa6d8a55c14e13f7667 /drivers/net/fsl-mc | |
| parent | a119357c43a4d4bd0e488a701255bcfea8f8bf6c (diff) | |
| parent | 6dedcedd6442295428ea7f02b0d30739499858a2 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'drivers/net/fsl-mc')
| -rw-r--r-- | drivers/net/fsl-mc/mc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index 53c4966c33..f83bd0c7f0 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -1147,7 +1147,8 @@ int fsl_mc_ldpaa_exit(bd_t *bd) { int err = 0; - if (bd && get_mc_boot_status() == -1) + /* MC is not loaded intentionally, So return success. */ + if (bd && get_mc_boot_status() != 0) return 0; if (bd && !get_mc_boot_status() && get_dpl_apply_status() == -1) { |