diff --git a/fs/fat/fs_fat32.c b/fs/fat/fs_fat32.c
index 78df1f1024d..7c0c6103322 100644
--- a/fs/fat/fs_fat32.c
+++ b/fs/fat/fs_fat32.c
@@ -547,7 +547,7 @@ static ssize_t fat_read(FAR struct file *filep, FAR char *buffer,
       ret = fat_currentsector(fs, ff, filep->f_pos);
       if (ret < 0)
         {
-           return ret;
+          goto errout_with_semaphore;
         }
     }
 
@@ -799,7 +799,7 @@ static ssize_t fat_write(FAR struct file *filep, FAR const char *buffer,
       ret = fat_currentsector(fs, ff, filep->f_pos);
       if (ret < 0)
         {
-           return ret;
+          goto errout_with_semaphore;
         }
     }