xf86-video-intel: src/i830_driver.c

Dave Airlie airlied at kemper.freedesktop.org
Wed Mar 17 19:50:18 PDT 2010


 src/i830_driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d4b3f257fbbb69c6f236d9803abe54a90d7d434
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Mar 18 12:48:39 2010 +1000

    intel: free bus id in error path after printing it out.
    
    the error message prints out a freed string, spotted during
    code reappropriation to radeon driver.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 53d8663..22e8472 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -649,10 +649,10 @@ static Bool i830_open_drm_master(ScrnInfoPtr scrn)
 
 	intel->drmSubFD = drmOpen("i915", busid);
 	if (intel->drmSubFD == -1) {
-		xfree(busid);
 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 			   "[drm] Failed to open DRM device for %s: %s\n",
 			   busid, strerror(errno));
+		xfree(busid);
 		return FALSE;
 	}
 


More information about the xorg-commit mailing list