diff options
| author | John Crispin <blogic@openwrt.org> | 2012-11-09 12:09:57 +0100 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2012-11-11 18:44:05 +0100 |
| commit | a15d129a352e5f6ab821b81bc3f692ecc952a815 (patch) | |
| tree | 1af7acc485e7d673eb43b828f57305c6c2ba35db /arch/mips/lantiq/prom.c | |
| parent | 69b1803ab79ebda75df2bfcb1c2a54d6c3de5325 (diff) | |
| download | linux-0-day-a15d129a352e5f6ab821b81bc3f692ecc952a815.tar.gz linux-0-day-a15d129a352e5f6ab821b81bc3f692ecc952a815.tar.xz | |
MIPS: lantiq: unbreak devicetree init
The bootmem was incorrectly freed resulting in lots of dangling pointers.
Additionally we should use of_platform_populate() as the Documentaion tells us
to do so.
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/4518
Diffstat (limited to 'arch/mips/lantiq/prom.c')
| -rw-r--r-- | arch/mips/lantiq/prom.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c index 6cfd6117fbfdc..9f9e875967aa2 100644 --- a/arch/mips/lantiq/prom.c +++ b/arch/mips/lantiq/prom.c @@ -87,9 +87,6 @@ void __init device_tree_init(void) reserve_bootmem(base, size, BOOTMEM_DEFAULT); unflatten_device_tree(); - - /* free the space reserved for the dt blob */ - free_bootmem(base, size); } void __init prom_init(void) @@ -119,7 +116,7 @@ int __init plat_of_setup(void) sizeof(of_ids[0].compatible)); strncpy(of_ids[1].compatible, "simple-bus", sizeof(of_ids[1].compatible)); - return of_platform_bus_probe(NULL, of_ids, NULL); + return of_platform_populate(NULL, of_ids, NULL, NULL); } arch_initcall(plat_of_setup); |