From 7a1fb986cc5ace474b6f040179bd130d4ba6f78f Mon Sep 17 00:00:00 2001 From: Michael Thayer Date: Mon, 31 Mar 2014 11:21:12 +0200 Subject: Do not drop the result of protocol detection In MousePickProtocol() with protocol PROT_AUTO we probe for the protocol to use but drop the result in most cases. This was causing DEVICE_INIT and DEVICE_ON to fail to be called with the VUID protocol. Git history suggests that this code was originally meant to cover both PS/2 auto-detection and OS- specific detection, but that only the first case was implemented at the time. Now that only the second is needed dropping the result to keep the protocol as PROT_AUTO is presumably no longer useful and seems to actively breaking things. Signed-off-by: Michael Thayer Reviewed-by: Alan Coopersmith Signed-off-by: Alan Coopersmith --- src/mouse.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mouse.c b/src/mouse.c index 139e1cd..9cb8da6 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -849,11 +849,8 @@ MousePickProtocol(InputInfoPtr pInfo, const char* device, { const char *osProt; if (osInfo->SetupAuto && (osProt = osInfo->SetupAuto(pInfo,NULL))) { - MouseProtocolID id = ProtocolNameToID(osProt); - if (id == PROT_UNKNOWN || id == PROT_UNSUP) { - protocolID = id; - protocol = osProt; - } + protocolID = ProtocolNameToID(osProt); + protocol = osProt; } } -- cgit v1.2.3