diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-29 16:35:17 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-29 16:35:17 -0600 |
| commit | 3d0ca16a64e5062e5572f23b334962b193a541d4 (patch) | |
| tree | a479155a6a237d2225a862af39a8a919a9ba3732 | |
| parent | 68d97688bef1be92d7246e92d1312336be9e0565 (diff) | |
| download | px4-nuttx-3d0ca16a64e5062e5572f23b334962b193a541d4.tar.gz px4-nuttx-3d0ca16a64e5062e5572f23b334962b193a541d4.tar.bz2 px4-nuttx-3d0ca16a64e5062e5572f23b334962b193a541d4.zip | |
Minor warning/latent bug clean-up of auto-mounter logic
| -rw-r--r-- | nuttx/configs/sama5d4-ek/Kconfig | 6 | ||||
| -rw-r--r-- | 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 |