diff options
| author | Tom Rini <trini@konsulko.com> | 2015-05-05 18:57:23 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-05 18:57:23 (GMT) |
| commit | d81572c272d4b0980fb9b8a02e1357090b002398 (patch) | |
| tree | 4b2f774d628ab51944f0ba1ff83c15ef6b082a0f /arch/powerpc/cpu/mpc85xx/portals.c | |
| parent | 1131d4e22cf8f13d0dabaad7f1b84d9baffdfbd6 (diff) | |
| parent | 8b0044ff5942943eaa49935f49d5006b346a60f8 (diff) | |
| download | u-boot-d81572c272d4b0980fb9b8a02e1357090b002398.tar.xz | |
Merge git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/portals.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/portals.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c index ec3b292..3777c6f 100644 --- a/arch/powerpc/cpu/mpc85xx/portals.c +++ b/arch/powerpc/cpu/mpc85xx/portals.c @@ -249,8 +249,13 @@ void fdt_fixup_qportals(void *blob) #ifdef CONFIG_FSL_CORENET u32 liodns[2]; #endif - const int *ci = fdt_getprop(blob, off, "cell-index", NULL); - int i = *ci; + const int *ci = fdt_getprop(blob, off, "cell-index", &err); + int i; + + if (!ci) + goto err; + + i = *ci; #ifdef CONFIG_SYS_DPAA_FMAN int j; #endif |