frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: don't attempt to enable and disable non-DIX devices 

Don't try to enable and disable devices with no entry in the DIX, such as
the evdev brain.
This commit is contained in:
Daniel Stone 2006-11-02 04:12:55 +02:00 committed by Daniel Stone
parent 64139c1950
commit 1d65429a9e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/xfree86/common/xf86Events.c
View File

@ -887,7 +887,8 @@ xf86VTSwitch()
*/ */
pInfo = xf86InputDevs; pInfo = xf86InputDevs;
while (pInfo) { while (pInfo) {
DisableDevice(pInfo->dev); if (pInfo->dev)
DisableDevice(pInfo->dev);
pInfo = pInfo->next; pInfo = pInfo->next;
} }
#endif /* !__UNIXOS2__ */ #endif /* !__UNIXOS2__ */
@ -927,8 +928,10 @@ xf86VTSwitch()
#if !defined(__UNIXOS2__) #if !defined(__UNIXOS2__)
pInfo = xf86InputDevs; pInfo = xf86InputDevs;
while (pInfo) { while (pInfo) {
xf86ReleaseKeys(pInfo->dev); if (pInfo->dev) {
EnableDevice(pInfo->dev); xf86ReleaseKeys(pInfo->dev);
EnableDevice(pInfo->dev);
}
pInfo = pInfo->next; pInfo = pInfo->next;
} }
/* XXX HACK */ /* XXX HACK */
@ -991,8 +994,10 @@ xf86VTSwitch()
#if !defined(__UNIXOS2__) #if !defined(__UNIXOS2__)
pInfo = xf86InputDevs; pInfo = xf86InputDevs;
while (pInfo) { while (pInfo) {
xf86ReleaseKeys(pInfo->dev); if (pInfo->dev) {
EnableDevice(pInfo->dev); xf86ReleaseKeys(pInfo->dev);
EnableDevice(pInfo->dev);
}
pInfo = pInfo->next; pInfo = pInfo->next;
} }
/* XXX HACK */ /* XXX HACK */