diff --git a/target/surf-msm7k/init.c b/target/surf-msm7k/init.c
index 63cb1a2..e671747 100644
--- a/target/surf-msm7k/init.c
+++ b/target/surf-msm7k/init.c
@@ -91,6 +91,8 @@
 	ptable_init(&flash_ptable);
 	smem_ptable_init();
 
+	flash_init();
+
 	offset = smem_get_apps_flash_start();
 	if (offset == 0xffffffff)
 		offset = BOARD_FLASH_OFFSET;
@@ -101,6 +103,5 @@
 	}
 
 	ptable_dump(&flash_ptable);
-
-	flash_init(&flash_ptable);
+	flash_set_ptable(&flash_ptable);
 }