diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-28 12:59:46 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-28 12:59:46 +0000 |
| commit | 3015123fd2904d907896b1aefbe32c267baa2dc2 (patch) | |
| tree | 3adc12a65779305c5fb676be577667ff7e33c389 /xorg-server/hw/xfree86/common/xf86Xinput.c | |
| parent | 0d9293f57738117231d77df831b6569d4f0739f2 (diff) | |
| parent | 0b9b391c5a7acb31e5d8061169649043a38d6d0e (diff) | |
| download | vcxsrv-3015123fd2904d907896b1aefbe32c267baa2dc2.tar.gz vcxsrv-3015123fd2904d907896b1aefbe32c267baa2dc2.tar.bz2 vcxsrv-3015123fd2904d907896b1aefbe32c267baa2dc2.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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c index 4166a1c38..d3af0c0c2 100644 --- a/xorg-server/hw/xfree86/common/xf86Xinput.c +++ b/xorg-server/hw/xfree86/common/xf86Xinput.c @@ -405,10 +405,10 @@ ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control) if (!pInfo->control_proc) {
switch (control->control) {
case DEVICE_CORE:
- return BadMatch;
- case DEVICE_RESOLUTION:
case DEVICE_ABS_CALIB:
case DEVICE_ABS_AREA:
+ return BadMatch;
+ case DEVICE_RESOLUTION:
case DEVICE_ENABLE:
return Success;
default:
@@ -775,6 +775,8 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable) goto unwind;
}
+ xf86Msg(X_INFO, "Using input driver '%s' for '%s'\n", drv->driverName, pInfo->name);
+
if (!drv->PreInit) {
xf86Msg(X_ERROR,
"Input driver `%s' has no PreInit function (ignoring)\n",
|