From 5b336585a4cdf11d20831a9536ad581e959ea7f1 Mon Sep 17 00:00:00 2001 From: Maarten Maathuis Date: Fri, 10 Oct 2008 23:23:02 +0200 Subject: [PATCH] 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. --- hw/xfree86/dri/dri.c | 2 -- 1 file changed, 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; } }