1 files changed, 5 insertions, 5 deletions
diff --git a/cpukit/sapi/src/iounregisterdriver.c b/cpukit/sapi/src/iounregisterdriver.c
index 3748d34151..fff4cd02bb 100644
--- a/cpukit/sapi/src/iounregisterdriver.c
+++ b/cpukit/sapi/src/iounregisterdriver.c
@@ -19,9 +19,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/io.h>
-#include <rtems/rtems/intr.h>
-#include <rtems/score/threaddispatch.h>
+#include <rtems/ioimpl.h>
 
 #include <string.h>
 
@@ -33,13 +31,15 @@ rtems_status_code rtems_io_unregister_driver(
     return RTEMS_CALLED_FROM_ISR;
 
   if ( major < _IO_Number_of_drivers ) {
-    _Thread_Disable_dispatch();
+    ISR_lock_Context lock_context;
+
+    _IO_Driver_registration_acquire( &lock_context );
     memset(
       &_IO_Driver_address_table[major],
       0,
       sizeof( rtems_driver_address_table )
     );
-    _Thread_Enable_dispatch();
+    _IO_Driver_registration_release( &lock_context );
 
     return RTEMS_SUCCESSFUL;
   }