From cfb98f3da936907945f48dad4c2345930f7beb60 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 1 May 2009 12:23:32 -0700 Subject: [PATCH] Revert "Leave allocator running until lower-level CloseScreens are done" Uh, oops -- the FD used to talk to the kernel is closed before the allocator_fini function is called now. This reverts commit 1872869e6ffcc8e6cab820c508fe5404d7e8ff9c. --- src/i830_driver.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/i830_driver.c b/src/i830_driver.c index ff7124df..1ff58668 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -3079,6 +3079,7 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen) xf86_cursors_fini (pScreen); + i830_allocator_fini(pScrn); i965_free_video(pScrn); free(pI830->offscreenImages); @@ -3098,9 +3099,7 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen) pScrn->vtSema = FALSE; pI830->closing = FALSE; pScreen->CloseScreen = pI830->CloseScreen; - (*pScreen->CloseScreen) (scrnIndex, pScreen); - i830_allocator_fini(pScrn); - return TRUE; + return (*pScreen->CloseScreen) (scrnIndex, pScreen); } static ModeStatus