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

xfree86: die gracefully in the vga arbiter if AddScreen fails 

vga arbiter will be locked in one device while AbortDDX will call LeaveVT
routines from the other device. Fail!

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Tiago Vignatti 2010-04-01 18:57:50 +03:00 committed by Keith Packard
parent e75f202e77
commit b9ad452ec9
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86Init.c
View File

@ -1269,7 +1269,9 @@ AbortDDX(void)
* we might not have been wrapped yet. Therefore enable * we might not have been wrapped yet. Therefore enable
* screen explicitely. * screen explicitely.
*/ */
xf86VGAarbiterLock(xf86Screens[i]);
(xf86Screens[i]->LeaveVT)(i, 0); (xf86Screens[i]->LeaveVT)(i, 0);
xf86VGAarbiterUnlock(xf86Screens[i]);
} }
} }