diff options
| -rw-r--r-- | nuttx/ChangeLog | 2 | ||||
| -rw-r--r-- | nuttx/fs/fat/fs_fat32util.c | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index a85870c82..3a030612e 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -2359,4 +2359,6 @@ GPIO is enabled. Also not adding the GPIO base address to several offsets. * configs/stm32f4discovery: Port to the STMicro STM32F4Discovery board (Contributed by Mike Smith). + * fs/fat/fs_fat32util.c: On a failure to recognize a FAT file system, the + mount logic should return -EINVAL, not -ENODEV. diff --git a/nuttx/fs/fat/fs_fat32util.c b/nuttx/fs/fat/fs_fat32util.c index 520ae42c1..8324ef598 100644 --- a/nuttx/fs/fat/fs_fat32util.c +++ b/nuttx/fs/fat/fs_fat32util.c @@ -111,6 +111,7 @@ static int fat_checkfsinfo(struct fat_mountpt_s *fs) return OK; } } + return -ENODEV; } @@ -142,7 +143,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs) MBR_GETSIGNATURE(fs->fs_buffer), MBR_GETBYTESPERSEC(fs->fs_buffer), fs->fs_hwsectorsize); - return -ENODEV; + return -EINVAL; } /* Verify the FAT32 file system type. The determination of the file @@ -179,7 +180,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs) fdbg("ERROR: fs_nfatsects %d fs_hwnsectors: %d\n", fs->fs_nfatsects, fs->fs_hwnsectors); - return -ENODEV; + return -EINVAL; } /* Get the total number of sectors on the volume. */ @@ -199,7 +200,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs) fdbg("ERROR: fs_fattotsec %d fs_hwnsectors: %d\n", fs->fs_fattotsec, fs->fs_hwnsectors); - return -ENODEV; + return -EINVAL; } /* Get the total number of reserved sectors */ @@ -210,7 +211,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs) fdbg("ERROR: fs_fatresvdseccount %d fs_hwnsectors: %d\n", fs->fs_fatresvdseccount, fs->fs_hwnsectors); - return -ENODEV; + return -EINVAL; } /* Get the number of FATs. This is probably two but could have other values */ @@ -226,7 +227,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs) fdbg("ERROR: ndatasectors %d fs_hwnsectors: %d\n", ndatasectors, fs->fs_hwnsectors); - return -ENODEV; + return -EINVAL; } /* Get the sectors per cluster */ @@ -259,7 +260,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs) fdbg("ERROR: notfat32: %d fs_nclusters: %d\n", notfat32, fs->fs_nclusters); - return -ENODEV; + return -EINVAL; } /* We have what appears to be a valid FAT filesystem! Save a few more things |