Mesa (7.10): r600: don't close fd on failed load
Dave Airlie
airlied at kemper.freedesktop.org
Sun Mar 13 21:18:33 UTC 2011
Module: Mesa
Branch: 7.10
Commit: d59da648178f04f68232ee8a8994843c6b547af8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d59da648178f04f68232ee8a8994843c6b547af8
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Mar 10 12:01:43 2011 +1000
r600: don't close fd on failed load
This fd gets passed in from outside, closing it causes the X.org server
to crap out when the driver doesn't identify the chipset.
Signed-off-by: Dave Airlie <airlied at redhat.com>
---
src/gallium/winsys/r600/drm/r600_drm.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/src/gallium/winsys/r600/drm/r600_drm.c b/src/gallium/winsys/r600/drm/r600_drm.c
index 56f2699..2fd09f0 100644
--- a/src/gallium/winsys/r600/drm/r600_drm.c
+++ b/src/gallium/winsys/r600/drm/r600_drm.c
@@ -202,9 +202,6 @@ struct radeon *radeon_decref(struct radeon *radeon)
if (radeon->bomgr)
r600_bomgr_destroy(radeon->bomgr);
- if (radeon->fd >= 0)
- drmClose(radeon->fd);
-
free(radeon);
return NULL;
}
More information about the mesa-commit
mailing list