diff options
| author | Keith Packard <keithp@keithp.com> | 2009-05-01 12:23:32 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-05-01 12:23:32 -0700 |
| commit | cfb98f3da936907945f48dad4c2345930f7beb60 (patch) | |
| tree | 8230ca180a701d55d8fcf494b1236a38e5ea364d | |
| parent | 11a853bd8e5d907fe7f5bd907453bcdac9032861 (diff) | |
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.
| -rw-r--r-- | src/i830_driver.c | 5 |
1 files 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 |