From 5fe9bfd23f17b84c3afaa82f75a7c517c9f8e0d3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 16 Oct 2007 18:23:48 +0930 Subject: [PATCH] xfree86: NIDR: don't call PairDevices explicitly. set isMaster to FALSE explicitly. Pairing isn't necessary, attachment should be done in EnableDevices. --- hw/xfree86/common/xf86Xinput.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 711bf94d4..fc846ba58 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -172,6 +172,7 @@ xf86ActivateDevice(LocalDevicePtr local) local->dev = dev; dev->coreEvents = local->flags & XI86_ALWAYS_CORE; + dev->isMaster = FALSE; dev->spriteInfo->spriteOwner = FALSE; if (DeviceIsPointerType(dev)) @@ -447,9 +448,6 @@ NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev) (!is_auto || xf86Info.autoEnableDevices)) EnableDevice(dev); - if (!IsPointerDevice(dev)) - PairDevices(NULL, GuessFreePointerDevice(), dev); - /* send enter/leave event, update sprite window */ CheckMotion(NULL, dev);