diff options
author | Maarten Maathuis <madman2003@gmail.com> | 2008-10-10 23:23:02 +0200 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2008-10-27 09:47:45 -0400 |
commit | ec5046ca7565e2364f42606b26159520a73dd207 (patch) | |
tree | c231107b23c0cef06b5884acaa59316be0f48725 | |
parent | f75163e5f6fc6dd63ac4eb97e403086031230250 (diff) |
dri: don't set the dixPrivate key to NULL, as this is a staticly set variable.
- This breaks on the 2nd server generation.
- No other subsystem seems to NULL their key.
- This should fix bug 17982.
(cherry picked from commit 5b336585a4cdf11d20831a9536ad581e959ea7f1)
-rw-r--r-- | hw/xfree86/dri/dri.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index b736c6ae0..79934a1c5 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -349,7 +349,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) pDRIPriv = (DRIScreenPrivPtr) xcalloc(1, sizeof(DRIScreenPrivRec)); if (!pDRIPriv) { dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL); - DRIScreenPrivKey = NULL; return FALSE; } @@ -742,7 +741,6 @@ DRICloseScreen(ScreenPtr pScreen) xfree(pDRIPriv); dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL); - DRIScreenPrivKey = NULL; } } |