powerpc/mpc85xx: Don't deref NULL if qman portal lacks cell-index

[karo-tx-uboot.git] / arch / powerpc / cpu / mpc85xx / portals.c

diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index ec3b2924b9d87c9651c5b25c9c1c2ca7974fa4c0..3777c6faa166142685e0364e4e23c82d010b3346 100644 (file)
--- 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