diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-06-24 22:52:59 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-06-27 08:45:00 +1000 |
| commit | b12fa0d5ab23237bc2ac02143739ef6861e55146 (patch) | |
| tree | 014389af681ee9ff1237460656996cf61cd29a4e /src/mouse.c | |
| parent | 1780667854d73bbd0e0596271b09f93321cd0b1d (diff) | |
| download | xorg-driver-xf86-input-mouse-b12fa0d5ab23237bc2ac02143739ef6861e55146.tar.gz | |
Fix Solaris issues with new ABI12 init process.
Based on BSD changes in commit a22879c6779283684fe4a61543fc95179b4f5d0b
by Alexandr Shadchin
Fix segfaults when mouse device fails to open.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/mouse.c')
| -rw-r--r-- | src/mouse.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mouse.c b/src/mouse.c index c3498ea..d981f6f 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -253,6 +253,7 @@ static MouseProtocolRec mouseProtocols[] = { /* Misc (usually OS-specific) */ { "SysMouse", MSE_MISC, mlDefaults, PROT_SYSMOUSE }, { "WSMouse", MSE_MISC, NULL, PROT_WSMOUSE }, + { "VUID", MSE_MISC, NULL, PROT_VUID }, /* end of list */ { NULL, MSE_NONE, NULL, PROT_UNKNOWN } @@ -819,6 +820,7 @@ MousePickProtocol(InputInfoPtr pInfo, const char* device, switch (protocolID) { case PROT_WSMOUSE: + case PROT_VUID: if (osInfo->PreInit) osInfo->PreInit(pInfo, protocol, 0); break; |