Commit 5583a77b authored by Alan Coopersmith's avatar Alan Coopersmith
Browse files

sun_mouse.c: Remove redundant option checks

Previously they checked pInfo->options, then fell back to
pInfo->conf_idev->commonOptions - but then 7bf22a36


replaced the latter with the former, resulting in some redunancy.
Signed-off-by: Alan Coopersmith's avatarAlan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: default avatarAlexandr Shadchin <alexandr.shadchin@gmail.com>
Reviewed-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 80d724d1
......@@ -611,16 +611,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->options, "Device", NULL);
}
}
if (*device != NULL) {
strmod = xf86CheckStrOption(pInfo->options, "StreamsModule", NULL);
if (strmod == NULL) {
strmod = xf86CheckStrOption(pInfo->options, "StreamsModule", NULL);
}
if (strmod) {
/* if a device name is already known, and a StreamsModule is
specified to convert events to VUID, then we don't need to
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment