diff options
author | Maarten Maathuis <madman2003@gmail.com> | 2008-10-10 23:23:02 +0200 |
---|---|---|
committer | Maarten Maathuis <madman2003@gmail.com> | 2008-10-10 23:28:30 +0200 |
commit | 5b336585a4cdf11d20831a9536ad581e959ea7f1 (patch) | |
tree | db7f920af2ead6d2e3b60ba715483a4c43350dbd | |
parent | b736f477f5324f79af30fc0f941ba0714a34ccda (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.
-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 d2599a9a8..37136590b 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -351,7 +351,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; } @@ -744,7 +743,6 @@ DRICloseScreen(ScreenPtr pScreen) xfree(pDRIPriv); dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL); - DRIScreenPrivKey = NULL; } } |