diff options
| author | Ping Cheng <pinglinux@gmail.com> | 2009-11-27 14:25:36 -0800 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-11-30 12:43:51 +1000 |
| commit | 54387e477904cadf3a0ebfc37567f808d4b94cce (patch) | |
| tree | e288433eacf60bdbfd82014235d21ee87d7c6adb /src/wcmConfig.c | |
| parent | f2e437e693f1ee482d112e69efdb0a383912c682 (diff) | |
| download | xf86-input-wacom-54387e477904cadf3a0ebfc37567f808d4b94cce.tar.gz | |
Only check device type for xorg.conf devices, not HAL devices.
HAL devices are hotplugged internally and the type is assigned based on the
device's capabilities. xorg.conf devices are user-specified and need to be
checked for validity.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/wcmConfig.c')
| -rw-r--r-- | src/wcmConfig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wcmConfig.c b/src/wcmConfig.c index 5d5ac2a..4313d72 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -441,8 +441,8 @@ static LocalDevicePtr xf86WcmInit(InputDriverPtr drv, IDevPtr dev, int flags) /* leave the undefined for auto-dev (if enabled) to deal with */ if(device) { - /* check if the type is valid for the device */ - if(!wcmIsAValidType(local, type)) + /* check if the type is valid for those don't need hotplug */ + if(!need_hotplug && !wcmIsAValidType(local, type)) goto SetupProc_fail; /* check if the device has been added */ |