Signed-off-by: Peter Hutterer <[email protected]>
---
src/wcmConfig.c | 2 +-
src/wcmValidateDevice.c | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/wcmConfig.c b/src/wcmConfig.c
index 58ac80c..c760ebd 100644
--- a/src/wcmConfig.c
+++ b/src/wcmConfig.c
@@ -391,7 +391,7 @@ static LocalDevicePtr wcmPreInit(InputDriverPtr drv,
IDevPtr dev, int flags)
if(!need_hotplug && !wcmIsAValidType(type, keys))
goto SetupProc_fail;
- /* check if the device has been added */
+ /* check if the same device file has been added already */
if (wcmIsDuplicate(device, local))
goto SetupProc_fail;
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index 40bb677..a7dd02c 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -77,6 +77,9 @@ static Bool wcmCheckSource(LocalDevicePtr local, dev_t
min_maj)
* Open the device and check it's major/minor, then compare this with every
* other wacom device listed in the config. If they share the same
* major/minor and the same source/type, fail.
+ * This is to detect duplicate devices if a device was added once through
+ * the xorg.conf and is then hotplugged through the server backend (HAL,
+ * udev). In this case, the hotplugged one fails.
*/
int wcmIsDuplicate(char* device, LocalDevicePtr local)
{
--
1.6.6.1
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
