diff options
| author |   Marc Zyngier <Marc.Zyngier@arm.com> | 2012-04-11 14:52:55 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2012-04-13 14:05:41 +0100 |
| commit | 9c5fd9e85f574d9d0361b2b878f55732290afe5b (patch) | |
| tree | 36f4de5233c85631b7831b6cc6b9d80e437d8e62 /arch/arm/boot/compressed | |
| parent | ARM: 7366/3: amba: Remove AMBA level regulator support (diff) | |
| download | linux-dev-9c5fd9e85f574d9d0361b2b878f55732290afe5b.tar.xz linux-dev-9c5fd9e85f574d9d0361b2b878f55732290afe5b.zip | |
ARM: 7379/1: DT: fix atags_to_fdt() second call site
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>
Cc: stable@vger.kernel.org
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot/compressed')
| -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 5f6045f1766c..dc7e8ce8e6be 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 |