summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-20 13:36:29 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-20 13:36:29 -0600
commit29268dcf2e63a5b3b2d9d8d9f56215819e9e3970 (patch)
treee6d9b9fe00cee56103cbf60c07afb4ab5a20dfb2
parent12d48b2c9305ccf13fbc61b8b5dcd7a637ccfb3a (diff)
downloadnuttx-29268dcf2e63a5b3b2d9d8d9f56215819e9e3970.tar.gz
nuttx-29268dcf2e63a5b3b2d9d8d9f56215819e9e3970.tar.bz2
nuttx-29268dcf2e63a5b3b2d9d8d9f56215819e9e3970.zip
Fix nsh_archinitialize return value
-rw-r--r--nuttx/configs/stm32f4discovery/src/stm32_nsh.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/nuttx/configs/stm32f4discovery/src/stm32_nsh.c b/nuttx/configs/stm32f4discovery/src/stm32_nsh.c
index 3692071bb..037fced44 100644
--- a/nuttx/configs/stm32f4discovery/src/stm32_nsh.c
+++ b/nuttx/configs/stm32f4discovery/src/stm32_nsh.c
@@ -64,11 +64,13 @@
int nsh_archinitialize(void)
{
-#ifndef CONFIG_BOARD_INITIALIZE
+#ifdef CONFIG_BOARD_INITIALIZE
+ /* Board initialization already performed by board_initialize() */
+
+ return OK;
+#else
/* Perform board-specific initialization */
- (void)stm32_bringup();
+ return stm32_bringup();
#endif
-
- return OK;
}