Merge branch 'master' of github.com:apache/incubator-nuttx

PX4 · Jan 7, 2020 · e298cce · e298cce
2 parents d1bec5a + 208463e
commit e298cce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_appinit.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_appinit.c
@@ -1,9 +1,9 @@
 /****************************************************************************
  * boards/arm/lpc43xx/bambino-200e/src/lpc43_appinit.c
  *
- *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016, 2020 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
- *           Alan Carvalho de Assis acassis@gmail.com [nuttx] <nuttx@googlegroups.com>
+ *           Alan Carvalho de Assis acassis@gmail.com
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -135,8 +135,6 @@ static int nsh_spifi_initialize(void)
 
   return OK;
 }
-#else
-#  define nsh_spifi_initialize() (OK)
 #endif
 
 /****************************************************************************
@@ -173,9 +171,15 @@ int board_app_initialize(uintptr_t arg)
 #endif
   int ret = 0;
 
+#ifdef CONFIG_LPC43_SPIFI
   /* Initialize the SPIFI block device */
 
-  nsh_spifi_initialize();
+  ret = nsh_spifi_initialize();
+  if (ret != OK)
+    {
+      syslog(LOG_ERR, "ERROR: nsh_spifi_initialize() fails: %d\n", ret);
+    }
+#endif
 
 #ifdef HAVE_MMCSD
   /* Get an instance of the SDIO interface */

diff --git a/net/icmpv6/icmpv6_netpoll.c b/net/icmpv6/icmpv6_netpoll.c
@@ -43,6 +43,7 @@
 #include <poll.h>
 #include <debug.h>
 
+#include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 
 #include "devif/devif.h"
@@ -158,7 +159,7 @@ int icmpv6_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
   FAR struct icmpv6_conn_s *conn = psock->s_conn;
   FAR struct icmpv6_poll_s *info;
   FAR struct devif_callback_s *cb;
-  int ret;
+  int ret = OK;
 
   DEBUGASSERT(conn != NULL && fds != NULL);