1 files changed, 2 insertions, 14 deletions
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index ba9fd063e..9e43196f6 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -437,22 +437,10 @@ CreatePointerBarrierClient(ClientPtr client,
 static int
 BarrierFreeBarrier(void *data, XID id)
 {
-    struct PointerBarrierClient *b = NULL, *barrier;
-    ScreenPtr screen;
-    BarrierScreenPtr cs;
+    struct PointerBarrierClient *barrier;
 
     barrier = container_of(data, struct PointerBarrierClient, barrier);
-
-    screen = barrier->screen;
-    cs = GetBarrierScreen(screen);
-
-    /* find and unlink from the screen private */
-    xorg_list_for_each_entry(b, &cs->barriers, entry) {
-        if (b == barrier) {
-            xorg_list_del(&b->entry);
-            break;
-        }
-    }
+    xorg_list_del(&barrier->entry);
 
     free(barrier);
     return Success;