1 files changed, 5 insertions, 4 deletions
diff --git a/c/src/lib/libc/close.c b/c/src/lib/libc/close.c
index 94ddb45c90..0583a36b22 100644
--- a/c/src/lib/libc/close.c
+++ b/c/src/lib/libc/close.c
@@ -22,17 +22,18 @@ int close(
   rtems_status_code   rc;
   int                 status;
 
-  if ( rtems_file_descriptor_type( fd ) ) {
+  rtems_libio_check_fd(fd);
+  iop = rtems_libio_iop(fd);
+  if ( iop->flags & LIBIO_FLAGS_HANDLER_MASK ) {
     int (*fp)(int  fd);
 
-    fp = rtems_libio_handlers[rtems_file_descriptor_type_index(fd)].close;
+    fp = rtems_libio_handlers[
+            (iop->flags >> LIBIO_FLAGS_HANDLER_SHIFT) - 1].close;
     if ( fp == NULL )
       set_errno_and_return_minus_one( EBADF );
     status = (*fp)( fd );
     return status;
   }
-  iop = rtems_libio_iop(fd);
-  rtems_libio_check_fd(fd);
 
   if ( !iop->handlers )
     set_errno_and_return_minus_one( EBADF );