summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2008-12-01 14:36:06 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2008-12-01 14:36:43 -0800
commit003c297d2902092074ede131db0dbc08d9116a5b (patch)
tree4f52b7aada4d3b5941534f7a8a485a2d822b0454
parent1e23b944aae3ef50cc764e6d2f0198deabe790ad (diff)
sun_mouse: check for Device in commonOptions if pInfo->options isn't set yet
-rw-r--r--src/sun_mouse.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/sun_mouse.c b/src/sun_mouse.c
index 13ce074..827af34 100644
--- a/src/sun_mouse.c
+++ b/src/sun_mouse.c
@@ -622,6 +622,10 @@ solarisMouseAutoProbe(InputInfoPtr pInfo, const char **protocol,
if (*device == NULL) {
/* Check to see if xorg.conf or HAL specified a device to use */
*device = xf86CheckStrOption(pInfo->options, "Device", NULL);
+ if (*device == NULL) {
+ *device = xf86CheckStrOption(pInfo->conf_idev->commonOptions,
+ "Device", NULL);
+ }
}
if (*device != NULL) {