summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-04-30 19:34:44 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2012-04-30 20:45:46 -0700
commitda5ccb256acf6cbb817d68499e0d9f533f750628 (patch)
tree8f530e54c8037db8fafffcc6adfae7a3cc022c95
parente63cb5ecc5ab7239c9c285920244cc89e5853920 (diff)
Solaris: ensure "Device" option is set, even if HAL didn't set it for us
Handles fallback to default /dev/kbd when AutoAddDevices is False and Device option is not manually set in xorg.conf, so that xinput device node property can be correctly set to it. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/sun_kbd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/sun_kbd.c b/src/sun_kbd.c
index 5f7b5c6..f1e530e 100644
--- a/src/sun_kbd.c
+++ b/src/sun_kbd.c
@@ -497,6 +497,8 @@ OpenKeyboard(InputInfoPtr pInfo)
kbdPath);
pInfo->read_input = ReadInput;
ret = TRUE;
+ /* in case it wasn't set and we fell back to default */
+ xf86ReplaceStrOption(pInfo->options, "Device", kbdPath);
}
free(kbdPath);