diff --git a/driver/xf86-input-acecad/src/acecad.c b/driver/xf86-input-acecad/src/acecad.c
index 6259f21c2..8f0bd6d87 100644
--- a/driver/xf86-input-acecad/src/acecad.c
+++ b/driver/xf86-input-acecad/src/acecad.c
@@ -491,7 +491,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
 
     if (local->fd != -1)
     {
-        RemoveEnabledDevice (local->fd);
+        xf86RemoveEnabledDevice (local);
         if (priv->buffer)
         {
             XisbFree(priv->buffer);
@@ -499,7 +499,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
         }
         xf86CloseSerial(local->fd);
     }
-    RemoveEnabledDevice (local->fd);
+    xf86RemoveEnabledDevice (local);
     local->fd = -1;
     return Success;
 
@@ -601,7 +601,7 @@ DeviceOff (DeviceIntPtr dev)
 
     if (local->fd != -1)
     {
-        RemoveEnabledDevice (local->fd);
+        xf86RemoveEnabledDevice (local);
         if (priv->buffer)
         {
             XisbFree(priv->buffer);