diff --git a/fs/vfs/fs_uio.c b/fs/vfs/fs_uio.c
index 0ee178bfbfec8..766e0ed08f267 100644
--- a/fs/vfs/fs_uio.c
+++ b/fs/vfs/fs_uio.c
@@ -82,8 +82,8 @@ ssize_t uio_calc_resid(FAR const struct uio *uio)
 void uio_advance(FAR struct uio *uio, size_t sz)
 {
   FAR const struct iovec *iov = uio->uio_iov;
-  int iovcnt = uio->uio_iovcnt;
   size_t offset_in_iov = uio->uio_offset_in_iov;
+  int iovcnt = uio->uio_iovcnt;
 
   DEBUGASSERT(sz <= SSIZE_MAX);
   DEBUGASSERT(uio->uio_resid <= SSIZE_MAX);
@@ -131,7 +131,7 @@ int uio_init(FAR struct uio *uio, FAR const struct iovec *iov, int iovcnt)
   resid = uio_calc_resid(uio);
   if (resid < 0)
     {
-      return -EINVAL;
+      return resid;
     }
 
   uio->uio_resid = resid;