diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-04-27 14:31:20 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-04-30 20:15:16 -0700 |
| commit | 5583a77bbadd2e89cbc69a66f27deee1a5da982c (patch) | |
| tree | 7d730a83f4091d9d60f9a68ca1651d38aa52fe60 | |
| parent | 80d724d13a8de585722967f7d18a65b4b555badd (diff) | |
| download | xorg-driver-xf86-input-mouse-5583a77bbadd2e89cbc69a66f27deee1a5da982c.tar.gz | |
sun_mouse.c: Remove redundant option checks
Previously they checked pInfo->options, then fell back to
pInfo->conf_idev->commonOptions - but then 7bf22a368c752fe76dc
replaced the latter with the former, resulting in some redunancy.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Alexandr Shadchin <alexandr.shadchin@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/sun_mouse.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/sun_mouse.c b/src/sun_mouse.c index ad38ba4..9a594cd 100644 --- a/src/sun_mouse.c +++ b/src/sun_mouse.c @@ -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 |