summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-03-30 01:00:47 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-03-30 01:00:47 +0200
commitd6e9623875de5714e85f7da5782ea665116f86dc (patch)
treed00894a9542280ea9414cd64dde634c317275ca3
parenta07c353f01f99ef3e62f84a32e91d539a4e4863a (diff)
Fix OSMouse OS-defined protocol support
Fix regression introduced by 0a088df6: in the case of an OS-specific protocol, the protocol is PROT_UNKNOWN, but should not be rejected: the core mouse drive just needs to let the OS driver handle it. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
-rw-r--r--src/mouse.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mouse.c b/src/mouse.c
index edb998f..c3498ea 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -953,6 +953,8 @@ MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
MouseFindDevice(pInfo, protocol);
xf86Msg(protocolFrom, "%s: Protocol: \"%s\"\n", pInfo->name, protocol);
+ if (protocolID == PROT_UNKNOWN)
+ goto out;
if (!(pProto = GetProtocol(protocolID)))
{
rc = BadValue;