diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c
index 8caa71157a9..254baa0dd6f 100644
--- a/arch/arm/src/sama5/sam_hsmci.c
+++ b/arch/arm/src/sama5/sam_hsmci.c
@@ -539,13 +539,13 @@ static void sam_notransfer(struct sam_dev_s *priv);
 
 static int  sam_hsmci_interrupt(struct sam_dev_s *priv);
 #ifdef CONFIG_SAMA5_HSMCI0
-static int  sam_hsmci0_interrupt(int irq, void *context);
+static int  sam_hsmci0_interrupt(int irq, void *context, void *arg);
 #endif
 #ifdef CONFIG_SAMA5_HSMCI1
-static int  sam_hsmci1_interrupt(int irq, void *context);
+static int  sam_hsmci1_interrupt(int irq, void *context, void *arg);
 #endif
 #ifdef CONFIG_SAMA5_HSMCI2
-static int  sam_hsmci2_interrupt(int irq, void *context);
+static int  sam_hsmci2_interrupt(int irq, void *context, void *arg);
 #endif
 
 /* SDIO interface methods ***************************************************/
@@ -1677,21 +1677,21 @@ static int sam_hsmci_interrupt(struct sam_dev_s *priv)
  ****************************************************************************/
 
 #ifdef CONFIG_SAMA5_HSMCI0
-static int sam_hsmci0_interrupt(int irq, void *context)
+static int sam_hsmci0_interrupt(int irq, void *context, void *arg)
 {
   return sam_hsmci_interrupt(&g_hsmci0);
 }
 #endif
 
 #ifdef CONFIG_SAMA5_HSMCI1
-static int sam_hsmci1_interrupt(int irq, void *context)
+static int sam_hsmci1_interrupt(int irq, void *context, void *arg)
 {
   return sam_hsmci_interrupt(&g_hsmci1);
 }
 #endif
 
 #ifdef CONFIG_SAMA5_HSMCI2
-static int sam_hsmci2_interrupt(int irq, void *context)
+static int sam_hsmci2_interrupt(int irq, void *context, void *arg)
 {
   return sam_hsmci_interrupt(&g_hsmci2);
 }
@@ -1984,7 +1984,7 @@ static int sam_attach(FAR struct sdio_dev_s *dev)
 
   /* Attach the HSMCI interrupt handler */
 
-  ret = irq_attach(irq, handler, NULL);
+  ret = irq_attach(irq, handler, priv);
   if (ret == OK)
     {
 
diff --git a/configs/spark/src/stm32_wireless.c b/configs/spark/src/stm32_wireless.c
index 9e51affd859..962faa93549 100644
--- a/configs/spark/src/stm32_wireless.c
+++ b/configs/spark/src/stm32_wireless.c
@@ -96,6 +96,7 @@ struct stm32_config_s
 {
   struct cc3000_config_s dev;
   xcpt_t handler;
+  void *arg;
 };
 
 /****************************************************************************