From: Anton Vorontsov Date: Thu, 10 Jul 2008 13:20:51 +0000 (+0400) Subject: 83xx: mpc8315erdb: fix silly thinko in fdt_tsec1_fixup X-Git-Tag: v2008.10-rc1~117^2~6^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=021f6df6e96af5b387810cf96d24848da1faa55c;p=u-boot 83xx: mpc8315erdb: fix silly thinko in fdt_tsec1_fixup The thinko was quite silly indeed, I messed with !ptr. Normally this would trigger some fault, but in U-Boot NULL pointer is equal to phys 0, so the code was working still, just didn't actually test mpc8315erdb environment variable value. Heh. Signed-off-by: Anton Vorontsov Signed-off-by: Kim Phillips --- diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c index 7555ffbdd6..3eecee2519 100644 --- a/board/freescale/mpc8315erdb/mpc8315erdb.c +++ b/board/freescale/mpc8315erdb/mpc8315erdb.c @@ -128,15 +128,16 @@ void fdt_tsec1_fixup(void *fdt, bd_t *bd) const char *path; int ret; - if (!mpc8315erdb) { - if (!strcmp(mpc8315erdb, "tsec1")) { - return; - } else if (strcmp(mpc8315erdb, "ulpi")) { - printf("WARNING: wrong `mpc8315erdb' environment " - "variable specified: `%s'. Should be `ulpi' " - "or `tsec1'.\n", mpc8315erdb); - return; - } + if (!mpc8315erdb) + return; + + if (!strcmp(mpc8315erdb, "tsec1")) { + return; + } else if (strcmp(mpc8315erdb, "ulpi")) { + printf("WARNING: wrong `mpc8315erdb' environment " + "variable specified: `%s'. Should be `ulpi' " + "or `tsec1'.\n", mpc8315erdb); + return; } ret = fdt_path_offset(fdt, "/aliases");