From 2972858b13df302672ffa11eaf43f93df2e2b658 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 10 May 2012 12:10:12 +1000
Subject: [PATCH 1/5] dix: return early from DisableDevice if the device is
 already disabled

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
(cherry picked from commit 46adcefb0e08515195d8e49985a4e210395700b3)
---
 dix/devices.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dix/devices.c b/dix/devices.c
index fbc9fec..557a68f 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -427,6 +427,9 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
     BOOL enabled;
     int flags[MAXDEVICES] = { 0 };
 
+    if (!dev->enabled)
+        return TRUE;
+
     for (prev = &inputInfo.devices;
          *prev && (*prev != dev); prev = &(*prev)->next);
     if (*prev != dev)
-- 
1.8.3