fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-24 21:50:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfree86: die gracefully in the vga arbiter if AddScreen fails

Browse source 
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>
(cherry picked from commit b9ad452ec9)

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Tiago Vignatti 2010-04-01 18:57:50 +03:00 • committed by Peter Hutterer
parent e7154e9375
commit 8c0548bc34
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

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