From 3d0ca16a64e5062e5572f23b334962b193a541d4 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 29 Jul 2014 16:35:17 -0600 Subject: Minor warning/latent bug clean-up of auto-mounter logic --- nuttx/configs/sama5d4-ek/Kconfig | 6 +++--- nuttx/configs/sama5d4-ek/src/sam_hsmci.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nuttx/configs/sama5d4-ek/Kconfig b/nuttx/configs/sama5d4-ek/Kconfig index ad8ac7936..6cbb49512 100644 --- a/nuttx/configs/sama5d4-ek/Kconfig +++ b/nuttx/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/nuttx/configs/sama5d4-ek/src/sam_hsmci.c b/nuttx/configs/sama5d4-ek/src/sam_hsmci.c index a6ab1439c..99016a8a6 100644 --- a/nuttx/configs/sama5d4-ek/src/sam_hsmci.c +++ b/nuttx/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 -- cgit v1.2.3