summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-02-02 06:51:05 -0500
committerTom Rini <trini@konsulko.com>2016-02-02 06:51:05 -0500
commit008e61f5120e7d3acb937953b1322e3aee3160d4 (patch)
treef5d4b4e4c96f2c12bf25d9dd8fdb05cbb9c7f5b5 /drivers/net
parent73c5c399977d55bd32fc718a6a4a5922d282fea2 (diff)
parent7711cc0a0648e215571b1d1768381963d92a1d97 (diff)
downloadtalos-obmc-uboot-008e61f5120e7d3acb937953b1322e3aee3160d4.tar.gz
talos-obmc-uboot-008e61f5120e7d3acb937953b1322e3aee3160d4.zip
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/fsl-mc/mc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index d38e98a2fb..fdbd584186 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -818,6 +818,7 @@ static int dprc_init(void)
goto err_root_open;
}
+ memset(&cfg, 0, sizeof(struct dprc_cfg));
cfg.options = DPRC_CFG_OPT_TOPOLOGY_CHANGES_ALLOWED |
DPRC_CFG_OPT_OBJ_CREATE_ALLOWED |
DPRC_CFG_OPT_ALLOC_ALLOWED;
@@ -1160,7 +1161,7 @@ int fsl_mc_ldpaa_exit(bd_t *bd)
err = dpbp_exit();
if (err < 0) {
- printf("dpni_exit() failed: %d\n", err);
+ printf("dpbp_exit() failed: %d\n", err);
goto err;
}
OpenPOWER on IntegriCloud