]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 13 Apr 2012 13:05:41 +0000 (14:05 +0100)
commit9c5fd9e85f574d9d0361b2b878f55732290afe5b
tree36f4de5233c85631b7831b6cc6b9d80e437d8e62
parent1e45860f541497d73162305d48b638d9b87e1ae3
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>
arch/arm/boot/compressed/head.S