diff --git a/configs/sama5d4-ek/Kconfig b/configs/sama5d4-ek/Kconfig
index ad8ac79365..6cbb495122 100644
--- a/configs/sama5d4-ek/Kconfig
+++ b/configs/sama5d4-ek/Kconfig
@@ -198,7 +198,7 @@ config SAMA5D4EK_HSMCI0_AUTOMOUNT_FSTYPE
 
 config SAMA5D4EK_HSMCI0_AUTOMOUNT_BLKDEV
 	string "HSMCI0 block device"
-	default "/dev/mmcds0"
+	default "/dev/mmcsd0"
 
 config SAMA5D4EK_HSMCI0_AUTOMOUNT_MOUNTPOINT
 	string "HSMCI0 mount point"
@@ -227,11 +227,11 @@ config SAMA5D4EK_HSMCI1_AUTOMOUNT_FSTYPE
 
 config SAMA5D4EK_HSMCI1_AUTOMOUNT_BLKDEV
 	string "HSMCI1 block device"
-	default "/dev/mmcds0"
+	default "/dev/mmcsd1"
 
 config SAMA5D4EK_HSMCI1_AUTOMOUNT_MOUNTPOINT
 	string "HSMCI1 mount point"
-	default "/mnt/sdcard0"
+	default "/mnt/sdcard1"
 
 config SAMA5D4EK_HSMCI1_AUTOMOUNT_DDELAY
 	int "HSMCI1 debounce delay (milliseconds)"
diff --git a/configs/sama5d4-ek/src/sam_hsmci.c b/configs/sama5d4-ek/src/sam_hsmci.c
index a6ab1439c2..99016a8a65 100644
--- a/configs/sama5d4-ek/src/sam_hsmci.c
+++ b/configs/sama5d4-ek/src/sam_hsmci.c
@@ -240,6 +240,8 @@ static int sam_hsmci1_cardetect(int irq, void *regs)
 
   sam_automount_event(HSMCI1_SLOTNO, sam_cardinserted(HSMCI1_SLOTNO));
 #endif
+
+  return ret;
 }
 #endif