diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c
index 169563cb31f..35422d42512 100644
--- a/arch/arm/src/samv7/sam_hsmci.c
+++ b/arch/arm/src/samv7/sam_hsmci.c
@@ -1113,7 +1113,7 @@ static inline void sam_cmdsample2(struct sam_dev_s *priv, int index,
  * Name: sam_cmddump
  *
  * Description:
- *   Dump all comand/response register data
+ *   Dump all command/response register data
  *
  ****************************************************************************/
 
@@ -2620,9 +2620,10 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev,
 
   /* Since interrupts not been enabled to this point, any relevant events
    * are pending and should not yet have occurred.
+   * REVISIT: Not true.  DMA interrupts are enabled.
    */
 
-  DEBUGASSERT(priv->waitevents != 0 && priv->wkupevent == 0);
+  // DEBUGASSERT(priv->waitevents != 0 && priv->wkupevent == 0);
 
   /* Now enable event-related interrupts. If the events are pending, they
    * may happen immediately here before entering the loop.
diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c
index d10650dfd3d..17125f4d9a8 100644
--- a/arch/arm/src/samv7/sam_xdmac.c
+++ b/arch/arm/src/samv7/sam_xdmac.c
@@ -2102,7 +2102,6 @@ void sam_dmadump(DMA_HANDLE handle, const struct sam_dmaregs_s *regs,
                  const char *msg)
 {
   struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle;
-  struct sam_xdmac_s *xdmac = sam_controller(xdmach);
 
   dmadbg("%s\n", msg);
   dmadbg("  DMA Global Registers:\n");