1 files changed, 5 insertions, 9 deletions
diff --git a/cpukit/posix/src/pthreadattrgetaffinitynp.c b/cpukit/posix/src/pthreadattrgetaffinitynp.c
index 6ed50507be..b281b11e5f 100644
--- a/cpukit/posix/src/pthreadattrgetaffinitynp.c
+++ b/cpukit/posix/src/pthreadattrgetaffinitynp.c
@@ -24,23 +24,19 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include <rtems/posix/pthreadimpl.h>
-#include <rtems/posix/priorityimpl.h>
-#include <rtems/score/threadimpl.h>
-
 int pthread_attr_getaffinity_np(
   const pthread_attr_t *attr,
   size_t                cpusetsize,
   cpu_set_t            *cpuset
 )
 {
-  if ( !cpuset )
-    return EFAULT;
-  if ( !attr )
-    return EFAULT;
+  if ( attr == NULL || !attr->is_initialized ) {
+    return EINVAL;
+  }
 
-  if ( cpusetsize != attr->affinitysetsize)
+  if ( cpuset == NULL || cpusetsize != attr->affinitysetsize ) {
     return EINVAL;
+  }
 
   CPU_COPY( attr->affinityset, cpuset );
   return 0;