xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 3626ab147b6749a355e7d21710447f13b9796c77
Author: Leo Liu <leo.liu at amd.com>
Date:   Fri Jun 14 10:27:20 2013 -0400

    radeon: fix a memory leak in get_modes() callback.
    
    leak happens when looping xrandr prop.
    
    Signed-off-by: Leo Liu <leo.liu at amd.com>
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index cd276f3..e342de7 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -837,8 +837,9 @@ drmmode_output_get_modes(xf86OutputPtr output)
 					drmModeFreePropertyBlob(drmmode_output->edid_blob);
 				drmmode_output->edid_blob = drmModeGetPropertyBlob(drmmode->fd, koutput->prop_values[i]);
 			}
-			drmModeFreeProperty(props);
 		}
+		if (props)
+			drmModeFreeProperty(props);
 	}
 
 	if (drmmode_output->edid_blob) {