sun_mouse: check for Device in commonOptions if pInfo->options isn't set yet

This commit is contained in:
Alan Coopersmith
2008-12-01 14:36:06 -08:00
parent 1e23b944aa
commit 003c297d29

View File

@@ -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) {