diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c
index 420477a1614..b7b8efde245 100644
--- a/src/gallium/frontends/dri/dri_util.c
+++ b/src/gallium/frontends/dri/dri_util.c
@@ -138,9 +138,7 @@ driCreateNewScreen2(int scrn, int fd,
 
     *driver_configs = mesa->initScreen(screen);
     if (*driver_configs == NULL) {
-        driDestroyOptionCache(&screen->optionCache);
-        driDestroyOptionInfo(&screen->optionInfo);
-        free(screen);
+        dri_destroy_screen(screen);
         return NULL;
     }