From 456f429ad655ab4d80e30c58291d801966a613b2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu, 15 Mar 2007 21:48:19 +1030
Subject: [PATCH] dix:    fix: don't return when device is same as argument.   
      fix: set access default rule to 0 on init.

---
 dix/devices.c | 2 +-
 dix/window.c  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dix/devices.c b/dix/devices.c
index 6c177863c..42eebf104 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -2040,7 +2040,7 @@ GetPairedKeyboard(DeviceIntPtr ptr)
 
     while(dev)
     {
-        if (ptr->pSprite == dev->pSprite)
+        if (ptr != dev && ptr->pSprite == dev->pSprite)
             return dev;
         dev = dev->next;
     }
diff --git a/dix/window.c b/dix/window.c
index 6c3558343..38bd74fe7 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3721,6 +3721,7 @@ MakeWindowOptional (register WindowPtr pWin)
     optional->access.ndeny = 0;
     optional->access.perm = NULL;
     optional->access.deny = NULL;
+    optional->access.defaultRule = 0;
     parentOptional = FindWindowWithOptional(pWin)->optional;
     optional->visual = parentOptional->visual;
     if (!pWin->cursorIsNone)