From 42924355204bd83d799bd151211ae6e014982849 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 10 Mar 2011 09:51:29 -0800 Subject: [PATCH] omap: Fix H4 init_irq to not call h4_init_flash There should be no reason to call h4_init_flash this early. It causes problems as things are not yet initialized. Tested-by: Tarun Kanti DebBarma Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-h4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 7e6bf4fa153..bac7933b8cb 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -299,7 +299,6 @@ static void __init omap_h4_init_early(void) static void __init omap_h4_init_irq(void) { omap_init_irq(); - h4_init_flash(); } static struct at24_platform_data m24c01 = { @@ -372,6 +371,7 @@ static void __init omap_h4_init(void) platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices)); omap2_usbfs_init(&h4_usb_config); omap_serial_init(); + h4_init_flash(); } static void __init omap_h4_map_io(void) -- 2.11.4.GIT