summaryrefslogtreecommitdiff
path: root/src/wcmConfig.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-11-12 16:26:13 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-11-17 12:58:08 +1000
commita34e42d7e640d2c3fa695a6eac905c0891375bc7 (patch)
treeb948b488a928afe61749cf9bff10118fe61cd33d /src/wcmConfig.c
parent44d8d03e7ffac87a845fc53a28b935afc2247894 (diff)
downloadxf86-input-wacom-a34e42d7e640d2c3fa695a6eac905c0891375bc7.tar.gz
If a device is specified, don't check for a wacom vendor id.
Testing for the vendor ID is useful when using auto-dev probe (though it might return false negatives). If a user was capable enough to specify a device option, assume they know what they're doing and just try to init the device. This ensures that the wacom driver works against serial devices that don't return a vendor ID. And it ensures that the driver can be used with other tablets by different vendors but a similar behaviour. Reported-by: Thomas Jaeger Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/wcmConfig.c')
-rwxr-xr-xsrc/wcmConfig.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/wcmConfig.c b/src/wcmConfig.c
index f0bbbf7..515219e 100755
--- a/src/wcmConfig.c
+++ b/src/wcmConfig.c
@@ -439,10 +439,6 @@ static LocalDevicePtr xf86WcmInit(InputDriverPtr drv, IDevPtr dev, int flags)
xf86CollectInputOptions(local, default_options, NULL);
device = xf86SetStrOption(local->options, "Device", NULL);
-
- if(device && !xf86WcmIsWacomDevice(device))
- goto SetupProc_fail;
-
type = xf86FindOptionValue(local->options, "Type");
need_hotplug = wcmNeedAutoHotplug(local, &type);