summaryrefslogtreecommitdiff
authorSascha Hlusiak <saschahlusiak@arcor.de>2011-11-13 19:36:07 (GMT)
committer Sascha Hlusiak <saschahlusiak@arcor.de>2011-11-13 19:36:07 (GMT)
commitb217fabdef1714ed4898e08de4c2a6b9cc8d4f0f (patch) (side-by-side diff)
tree74f8b6b93b96ba363d5d828cbf2b0b35bd431827
parent411c1838456c055d3f911c54ed58bb11a6bf0da3 (diff)
downloadxf86-input-joystick-b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f.zip
xf86-input-joystick-b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f.tar.gz
Copy pInfo->driver to option list to fix hotplugging of keyboard device
udev does copy the Driver line to the list of options, but when manually specifying the driver in xorg.conf, the option "Driver" is unset. Because we do hotplug a sub-device from within the core device, we need the "Driver" option to be present in the list. This should fix archlinux bug #23577: https://bugs.archlinux.org/task/23577 Thanks to Malek for coming up with a fix. Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/jstk_key.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/jstk_key.c b/src/jstk_key.c
index a71275a..241b15d 100644
--- a/src/jstk_key.c
+++ b/src/jstk_key.c
@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
strcat(name, " (keys)");
opts = xf86ReplaceStrOption(opts, "Name", name);
opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
+ opts = xf86AddNewOption(opts, "Driver", pInfo->driver);
while(opts)
{