diff --git a/arch/arm/src/armv7-m/up_exception.S b/arch/arm/src/armv7-m/up_exception.S
index 17344db413..35d9231871 100644
--- a/arch/arm/src/armv7-m/up_exception.S
+++ b/arch/arm/src/armv7-m/up_exception.S
@@ -1,6 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32/up_exception.S
- * arch/arm/src/chip/up_exception.S
+ * arch/arm/src/armv7-m/up_exception.S
  *
  *   Copyright (C) 2009-2013 Gregory Nutt. All rights reserved.
  *   Copyright (C) 2012 Michael Smith. All rights reserved.
diff --git a/arch/arm/src/armv7-m/up_fpu.S b/arch/arm/src/armv7-m/up_fpu.S
index 707420f064..e7a4d237ca 100644
--- a/arch/arm/src/armv7-m/up_fpu.S
+++ b/arch/arm/src/armv7-m/up_fpu.S
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/armv7-m/stm32_fpu.S
+ * arch/arm/src/armv7-m/up_fpu.S
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c
index 1496dc5a82..2c9ae4cacb 100644
--- a/arch/arm/src/stm32/stm32_otgfsdev.c
+++ b/arch/arm/src/stm32/stm32_otgfsdev.c
@@ -397,7 +397,6 @@ struct stm32_ep_s
   struct stm32_req_s    *tail;
   uint8_t                epphy;        /* Physical EP address */
   uint8_t                eptype:2;     /* Endpoint type */
-  uint8_t                configured:1; /* 1: Endpoint has been configured */
   uint8_t                active:1;     /* 1: A request is being processed */
   uint8_t                stalled:1;    /* 1: Endpoint is stalled */
   uint8_t                isin:1;       /* 1: IN Endpoint */
@@ -1889,13 +1888,6 @@ static struct stm32_ep_s *stm32_ep_findbyaddr(struct stm32_usbdev_s *priv,
       privep = &priv->epout[epphy];
     }
 
-  /* Verify that the endpoint has been configured */
-
-  if (!privep->configured)
-    {
-      return NULL;
-    }
-
   /* Return endpoint reference */
 
   DEBUGASSERT(privep->epphy == epphy);
@@ -4444,19 +4436,6 @@ static int stm32_epin_setstall(FAR struct stm32_ep_s *privep)
   regaddr = STM32_OTGFS_DIEPCTL(privep->epphy);
   regval  = stm32_getreg(regaddr);
 
-  /* Is the endpoint enabled? */
-
-  if ((regval & OTGFS_DIEPCTL_EPENA) != 0)
-    {
-      /* Yes.. the endpoint is enabled, disable it */
-
-      regval = OTGFS_DIEPCTL_EPDIS;
-    }
-  else
-    {
-      regval = 0;
-    }
-
   /* Then stall the endpoint */
 
   regval |= OTGFS_DIEPCTL_STALL;