From 4fa6106b5733c8e3e41b4baf12dca7c2a3b10825 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 12 Aug 2017 14:28:27 -0600
Subject: [PATCH] Fix some compile problems found in build testing.

---
 arch/arm/src/sama5/sam_lcd.c     | 6 ++++++
 arch/arm/src/sama5/sam_ohci.c    | 2 +-
 drivers/wireless/cc3000/cc3000.c | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c
index 3befc8fec6..4e27e1ef2a 100644
--- a/arch/arm/src/sama5/sam_lcd.c
+++ b/arch/arm/src/sama5/sam_lcd.c
@@ -820,6 +820,7 @@ static const uintptr_t g_layerenable[LCDC_NLAYERS] =
 #endif
 };
 
+#if 0 /* Not used */
 static const uintptr_t g_layerdisable[LCDC_NLAYERS] =
 {
   SAM_LCDC_BASECHDR,
@@ -830,7 +831,9 @@ static const uintptr_t g_layerdisable[LCDC_NLAYERS] =
   , SAM_LCDC_HCRCHDR
 #endif
 };
+#endif
 
+#if 0 /* #if defined(SAMA5_HAVE_POSITION) && defined(SAMA5_HAVE_SIZE) -- not used */
 static const uintptr_t g_layerstatus[LCDC_NLAYERS] =
 {
   SAM_LCDC_BASECHSR,
@@ -841,6 +844,7 @@ static const uintptr_t g_layerstatus[LCDC_NLAYERS] =
   , SAM_LCDC_HCRCHSR
 #endif
 };
+#endif
 
 static const uintptr_t g_layerblend[LCDC_NLAYERS] =
 {
@@ -908,6 +912,7 @@ static const uintptr_t g_layercfg[LCDC_NLAYERS] =
 #endif
 };
 
+#if 0 /* Not used */
 static const uintptr_t g_layercolor[LCDC_NLAYERS] =
 {
   SAM_LCDC_BASECFG1,
@@ -918,6 +923,7 @@ static const uintptr_t g_layercolor[LCDC_NLAYERS] =
   , SAM_LCDC_HCRCFG1
 #endif
 };
+#endif
 
 #ifdef SAMA5_HAVE_POSITION
 static const uintptr_t g_layerpos[LCDC_NLAYERS] =
diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c
index e90c2fdde6..8ecb6a0194 100644
--- a/arch/arm/src/sama5/sam_ohci.c
+++ b/arch/arm/src/sama5/sam_ohci.c
@@ -1374,7 +1374,7 @@ static inline int sam_reminted(struct sam_ed_s *ed)
 
       /* Save the new minimum interval */
 
-      if ((ed->hw.ctrl && ED_CONTROL_D_MASK) == ED_CONTROL_D_IN)
+      if ((ed->hw.ctrl & ED_CONTROL_D_MASK) == ED_CONTROL_D_IN)
         {
           g_ohci.ininterval  = interval;
         }
diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c
index 4e72232dd1..f290f96789 100644
--- a/drivers/wireless/cc3000/cc3000.c
+++ b/drivers/wireless/cc3000/cc3000.c
@@ -1648,7 +1648,7 @@ static int cc3000_wait_data(FAR struct cc3000_dev_s *priv, int sockfd)
           cc3000_devtake(priv);
           sched_unlock();
 
-          if (!priv->sockets[s].sd == sockfd)
+          if (priv->sockets[s].sd != sockfd)
             {
               return -1;
             }