xf86-video-ati: Branch '6.12-branch'

[Alex Deucher]

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

New commits:
commit c2892cbd18e0f25401b615055425f727e096b7cd
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Nov 17 11:45:09 2009 -0500

    radeon: fix potential memory leak in ddc code
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_output.c b/src/radeon_output.c
index acba31f..edf59cd 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -268,9 +268,11 @@ radeon_ddc_connected(xf86OutputPtr output)
 	    break;
 	}
 
-	if (MonType != MT_NONE)
+	if (MonType != MT_NONE) {
 	    if (!xf86ReturnOptValBool(info->Options, OPTION_IGNORE_EDID, FALSE))
 		xf86OutputSetEDID(output, MonInfo);
+	} else
+	    xfree(MonInfo);
     } else
 	MonType = MT_NONE;