diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-27 06:40:50 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-27 06:40:50 +0000 |
| commit | 619d6f3626f36af85cc40eeee95c7585d906fe5c (patch) | |
| tree | 0428401464cc6127a651c94261678072cb3bafc3 /xorg-server/hw/xfree86/common/xf86Xinput.c | |
| parent | d89c0289565a662a378df6e3c05de42982ab1c9d (diff) | |
| parent | 80cb6bca9f771ef15c00cc41af2b9f315d66258d (diff) | |
| download | vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.tar.gz vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.tar.bz2 vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Xinput.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Xinput.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c index 21921b2c3..2d82ccdbc 100644 --- a/xorg-server/hw/xfree86/common/xf86Xinput.c +++ b/xorg-server/hw/xfree86/common/xf86Xinput.c @@ -854,7 +854,7 @@ unwind: }
void
-DeleteInputDeviceRequest(DeviceIntPtr pDev, int flags)
+DeleteInputDeviceRequest(DeviceIntPtr pDev)
{
LocalDevicePtr pInfo = (LocalDevicePtr) pDev->public.devicePrivate;
InputDriverPtr drv = NULL;
@@ -874,9 +874,9 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev, int flags) if (!isMaster && pInfo != NULL)
{
if(drv->UnInit)
- drv->UnInit(drv, pInfo, flags);
+ drv->UnInit(drv, pInfo, 0);
else
- xf86DeleteInput(pInfo, flags);
+ xf86DeleteInput(pInfo, 0);
/* devices added through HAL aren't in the config layout */
it = xf86ConfigLayout.inputs;
@@ -1267,7 +1267,7 @@ xf86DisableDevice(DeviceIntPtr dev, Bool panic) } else
{
SendDevicePresenceEvent(dev->id, DeviceUnrecoverable);
- DeleteInputDeviceRequest(dev, 0);
+ DeleteInputDeviceRequest(dev);
}
}
|