diff options
| author | Tiago Vignatti <tiago.vignatti@nokia.com> | 2010-04-01 18:57:50 +0300 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-04-02 00:09:20 -0700 |
| commit | b9ad452ec92a7dcbed680acb3f3b8ec29fa660df (patch) | |
| tree | 166a553ba9f87d2fd0b08d5b86dc1058a7584288 | |
| parent | e75f202e7768b7cc0eb2ad0e0f3f51ea81cd7275 (diff) | |
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>
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 72241a776..71ac9a9fe 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1269,7 +1269,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]); } } |