diff --git a/fs/vfs/fs_fcntl.c b/fs/vfs/fs_fcntl.c
index e1bf25bf1f..c24305a0f8 100644
--- a/fs/vfs/fs_fcntl.c
+++ b/fs/vfs/fs_fcntl.c
@@ -1,7 +1,8 @@
 /****************************************************************************
  * fs/vfs/fs_fcntl.c
  *
- *   Copyright (C) 2009, 2012-2014, 2016-2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2012-2014, 2016-2017 Gregory Nutt. All rights
+ *     reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -153,6 +154,7 @@ int file_vfcntl(FAR struct file *filep, int cmd, va_list ap)
           oflags          &=  FFCNTL;
           filep->f_oflags &= ~FFCNTL;
           filep->f_oflags |=  oflags;
+          ret              =  OK;
         }
         break;
 
diff --git a/net/socket/net_vfcntl.c b/net/socket/net_vfcntl.c
index 3833908af3..a65862aa69 100644
--- a/net/socket/net_vfcntl.c
+++ b/net/socket/net_vfcntl.c
@@ -195,10 +195,13 @@ int net_vfcntl(int sockfd, int cmd, va_list ap)
                  {
                    psock->s_flags &= ~_SF_NONBLOCK;
                  }
+
+               ret = OK;
             }
           else
             {
               nerr("ERROR: Non-blocking not supported for this socket\n");
+              ret = -ENOSYS;
             }
         }
         break;