]> git.baikalelectronics.ru Git - kernel.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)
commitcf6fbe372e9a4ceeb5167e86f5c044e1c9be87f4
tree36f4de5233c85631b7831b6cc6b9d80e437d8e62
parent071546eaa5ca9894efb860dc0975c089fb3aa32e
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