aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-03-08 16:09:47 -0500
committerAdam Jackson <ajax@redhat.com>2008-03-08 16:09:47 -0500
commitf1445feac77af65098eef1c2d86ae067d81fc6cb (patch)
treeef9b162465119c59267ee2d00cf7b0f3d3a70212
parentIgnore button events above BTN_TASK for now. (diff)
downloadxf86-input-evdev-f1445feac77af65098eef1c2d86ae067d81fc6cb.tar.gz
xf86-input-evdev-f1445feac77af65098eef1c2d86ae067d81fc6cb.tar.bz2
xf86-input-evdev-f1445feac77af65098eef1c2d86ae067d81fc6cb.zip
Parse Option "Path" as well as Option "Device".
The hotplug core passes Path not Device. With this change, hotplugging works.
-rw-r--r--src/evdev.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 2a53ded..f641468 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -676,7 +676,9 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
xf86CollectInputOptions(pInfo, NULL, NULL);
xf86ProcessCommonOptions(pInfo, pInfo->options);
- device = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
+ device = xf86CheckStrOption(dev->commonOptions, "Path", NULL);
+ if (!device)
+ device = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
if (!device) {
xf86Msg(X_ERROR, "%s: No device specified.\n", pInfo->name);
xfree(pEvdev);