diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index 49dc9a615d2..636d97ba2b6 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -73,8 +73,10 @@
 /* Configuration ***************************************************************/
 /* Pre-requisites */
 
-#ifndef CONFIG_SCHED_WORKQUEUE
+#if !defined(CONFIG_SCHED_WORKQUEUE)
 #  error Work queue support is required (CONFIG_SCHED_WORKQUEUE)
+#elif !defined(CONFIG_SCHED_HPWORK)
+#  error Hi-priority work queue support is required (CONFIG_SCHED_HPWORK)
 #endif
 
 /* Configurable number of Queue Head (QH) structures.  The default is one per
@@ -2570,7 +2572,7 @@ static inline int lpc31_asynch_setup(struct lpc31_rhport_s *rhport,
   int ret = -ENODEV;
 
   DEBUGASSERT(rhport && epinfo && !epinfo->iocwait &&
-              epinfo->callback == NULL);
+              callback != NULL && epinfo->callback == NULL);
 
   /* Is the device still connected? */
 
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index 22a12645f8b..6165a029d1e 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/arch/arm/src/sama5/sam_ehci.c
@@ -73,8 +73,10 @@
 /* Configuration ***************************************************************/
 /* Pre-requisites */
 
-#ifndef CONFIG_SCHED_WORKQUEUE
+#if !defined(CONFIG_SCHED_WORKQUEUE)
 #  error Work queue support is required (CONFIG_SCHED_WORKQUEUE)
+#elif !defined(CONFIG_SCHED_HPWORK)
+#  error Hi-priority work queue support is required (CONFIG_SCHED_HPWORK)
 #endif
 
 /* Configurable number of Queue Head (QH) structures.  The default is one per