diff options
| author | Marc Zyngier <Marc.Zyngier@arm.com> | 2012-04-11 14:52:55 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-22 15:38:54 -0700 |
| commit | 464070635ea618d01561be929bebd6a88aedf0ae (patch) | |
| tree | c35e0f1049213510fa59d60cfb5faece27f57763 /arch/arm/boot | |
| parent | 6bc39a3bf99f91ce15dd676765d30a1fd2d5dab2 (diff) | |
| download | lwn-464070635ea618d01561be929bebd6a88aedf0ae.tar.gz lwn-464070635ea618d01561be929bebd6a88aedf0ae.zip | |
ARM: 7379/1: DT: fix atags_to_fdt() second call site
commit 9c5fd9e85f574d9d0361b2b878f55732290afe5b upstream.
atags_to_fdt() returns 1 when it fails to find a valid FDT signature.
The CONFIG_ARM_ATAG_DTB_COMPAT code is supposed to retry with another
location, but only does so when the initial call doesn't fail.
Fix this by using the correct condition in the assembly code.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index c5d60250d43d..15bc187de14a 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -273,7 +273,7 @@ restart: adr r0, LC0 add r0, r0, #0x100 mov r1, r6 sub r2, sp, r6 - blne atags_to_fdt + bleq atags_to_fdt ldmfd sp!, {r0-r3, ip, lr} sub sp, sp, #0x10000 |