xf86-video-intel: src/i830_lvds.c

Zhenyu Wang zhen at kemper.freedesktop.org
Sun Dec 14 17:14:36 PST 2008


 src/i830_lvds.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d917583c19e2eb20a559eddaa100ce71d8fbe48c
Author: Pierre Willenbrock <pierre at pirsoft.de>
Date:   Mon Dec 15 09:08:30 2008 +0800

    closedir only after finishing use of any results from readdir

diff --git a/src/i830_lvds.c b/src/i830_lvds.c
index b1bf6ee..c6002eb 100644
--- a/src/i830_lvds.c
+++ b/src/i830_lvds.c
@@ -422,7 +422,6 @@ i830_lvds_acpi_lid_open(xf86OutputPtr output)
 	}
 	if (strcmp(lid_dent->d_name, ".") &&
 		strcmp(lid_dent->d_name, "..")) {
-	    closedir(lid_dir);
 	    break;
 	}
     }
@@ -432,6 +431,8 @@ i830_lvds_acpi_lid_open(xf86OutputPtr output)
     strcat(state_name, lid_dent->d_name);
     strcat(state_name, "/state");
 
+    closedir(lid_dir);
+
     if ((fd = open(state_name, O_RDONLY)) == -1) {
 	free(state_name);
 	goto out;


More information about the xorg-commit mailing list