From 7ec07beedf486d8ab901ea3e3e3a87768a051e44 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 11 May 2017 17:21:13 +0100 Subject: [PATCH] egl/drm: make use of the dri2_display_destroy() helper Signed-off-by: Emil Velikov Tested-by: Rob Herring --- src/egl/drivers/dri2/platform_drm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index 455225e56b0..80e824f3d54 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -679,6 +679,7 @@ dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp) if (!dri2_dpy) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); + dri2_dpy->fd = -1; disp->DriverData = (void *) dri2_dpy; gbm = disp->PlatformDisplay; @@ -760,10 +761,6 @@ dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp) return EGL_TRUE; cleanup: - if (fd >= 0) - close(fd); - - free(dri2_dpy); - disp->DriverData = NULL; + dri2_display_destroy(disp); return _eglError(EGL_NOT_INITIALIZED, err); } -- 2.30.2