From d17f5850642d874207a51080ca1f6eb9f4ecf1f3 Mon Sep 17 00:00:00 2001 From: Jan Weitzel Date: Fri, 21 Jun 2013 15:47:42 +0200 Subject: OMAP4: fix omap4_bootsource regression commit d7a913469c34553e96c887f8a9934bacd794e81c breaks boot source detection for pcm049. The tracing vectors shows all tested boot sources, so order is important. By not returning but overwriting src we effectively reversed the order if more than one flag is set. Signed-off-by: Jan Weitzel Signed-off-by: Sascha Hauer --- arch/arm/mach-omap/omap4_generic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c index 3d6ec25c93..7d71fdc201 100644 --- a/arch/arm/mach-omap/omap4_generic.c +++ b/arch/arm/mach-omap/omap4_generic.c @@ -508,9 +508,9 @@ static int omap4_bootsource(void) if (bootsrc & (1 << 5)) src = BOOTSOURCE_MMC; - if (bootsrc & (1 << 3)) + else if (bootsrc & (1 << 3)) src = BOOTSOURCE_NAND; - if (bootsrc & (1<<20)) + else if (bootsrc & (1<<20)) src = BOOTSOURCE_USB; bootsource_set(src); bootsource_set_instance(0); -- cgit v1.2.3