diff options
Diffstat (limited to 'src/sun_mouse.c')
| -rw-r--r-- | src/sun_mouse.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/sun_mouse.c b/src/sun_mouse.c index b0d53e8..755ed32 100644 --- a/src/sun_mouse.c +++ b/src/sun_mouse.c @@ -205,6 +205,10 @@ vuidPreInit(InputInfoPtr pInfo, const char *protocol, int flags) VuidMsePtr pVuidMse; int buttons, i; + /* Ensure we don't add the same device twice */ + if (getVuidMsePriv(pInfo) != NULL) + return TRUE; + pVuidMse = calloc(sizeof(VuidMseRec), 1); if (pVuidMse == NULL) { xf86Msg(X_ERROR, "%s: cannot allocate VuidMouseRec\n", pInfo->name); @@ -684,7 +688,9 @@ SetupAuto(InputInfoPtr pInfo, int *protoPara) } else if (pMse->protocolID == PROT_AUTO) { pdev = xf86CheckStrOption(pInfo->options, "Device", NULL); - solarisMouseAutoProbe(pInfo, &pproto, &pdev); + if ((solarisMouseAutoProbe(pInfo, &pproto, &pdev) != FALSE) && + (pproto != NULL)) + sunMousePreInit(pInfo, pproto, 0); } return pproto; } |