ARM: 7379/1: DT: fix atags_to_fdt() second call site
authorMarc Zyngier <Marc.Zyngier@arm.com>
Wed, 11 Apr 2012 13:52:55 +0000 (14:52 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Apr 2012 22:30:58 +0000 (15:30 -0700)
commit9188e08805ad8d39618a5be21733af98bd43e63e
tree0350ecc188da57154124d0d906859086e389ff4e
parent8d8ffc3cd352e5ea6bff94d176be3dfeeaba3809
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>
arch/arm/boot/compressed/head.S