[PATCH 02/30] dix: Stop setting oldMaster for nothing.

Cyril Brulebois kibi at debian.org
Fri May 20 08:35:12 PDT 2011


Signed-off-by: Cyril Brulebois <kibi at debian.org>
---
 dix/devices.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index 9a4498b..36a3167 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -2415,7 +2415,6 @@ int
 AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
 {
     ScreenPtr screen;
-    DeviceIntPtr oldmaster;
     if (!dev || IsMaster(dev))
         return BadDevice;
 
@@ -2434,7 +2433,6 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
         free(dev->spriteInfo->sprite);
     }
 
-    oldmaster = GetMaster(dev, MASTER_ATTACHED);
     dev->master = master;
 
     /* If device is set to floating, we need to create a sprite for it,
-- 
1.7.5.1



More information about the xorg-devel mailing list