diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c8fa9689b..6d7fd7741 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Fri 13 Jul 2001 08:08:49 PM EDT  Christopher Faylor <cgf@cygnus.com>
+
+	* syscalls.cc (stat_worker): Simplify previous change.
+
 Fri Jul 13 13:13:09 2001  Christopher Faylor <cgf@cygnus.com>
 
 	* syscalls.cc (_unlink): Correct (?) logic which determines when
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index d76c2cf1a..2e3f4262a 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -1032,7 +1032,6 @@ stat_worker (const char *caller, const char *name, struct stat *buf,
   int attribute = 0;
   uid_t uid;
   gid_t gid;
-  int err;
 
   UINT dtype;
   fhandler_disk_file fh (NULL);
@@ -1050,11 +1049,9 @@ stat_worker (const char *caller, const char *name, struct stat *buf,
       goto done;
     }
 
-  if ((err = check_null_invalid_struct_errno (buf)))
-    {
-      set_errno (err);
-      goto done;
-    }
+  if (check_null_invalid_struct_errno (buf))
+    goto done;
+
   memset (buf, 0, sizeof (struct stat));
 
   if (real_path.is_device ())