renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 02:04:05 +08:00
Code

ARM: 7379/1: DT: fix atags_to_fdt() second call site

Browse Source 
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>
This commit is contained in:
Marc Zyngier 2012-04-11 14:52:55 +01:00 committed by Russell King
parent 1e45860f54
commit 9c5fd9e85f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/compressed/head.S
View File

@ -273,7 +273,7 @@ restart: adr r0, LC0
add r0, r0, #0x100 add r0, r0, #0x100
mov r1, r6 mov r1, r6
sub r2, sp, r6 sub r2, sp, r6
blne atags_to_fdt bleq atags_to_fdt
ldmfd sp!, {r0-r3, ip, lr} ldmfd sp!, {r0-r3, ip, lr}
sub sp, sp, #0x10000 sub sp, sp, #0x10000