From bda289b0aea7be39c73066b993ce9e4bf9df7d54 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 29 Jul 2008 11:58:16 -0700
Subject: [PATCH] Reset lastSlave when disabling devices

---
 dix/devices.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dix/devices.c b/dix/devices.c
index 0a68c0e61..82bcc64fd 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -315,6 +315,14 @@ DisableDevice(DeviceIntPtr dev)
                 AttachDevice(NULL, other, NULL);
         }
     }
+    else
+    {
+        for (other = inputInfo.devices; other; other = other->next)
+        {
+	    if (other->isMaster && other->u.lastSlave == dev)
+		other->u.lastSlave = NULL;
+	}
+    }
 
     if (dev->isMaster && dev->spriteInfo->sprite)
     {