xf86-video-ati: Branch 'master'

[Jerome Glisse]

 src/drmmode_display.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b8ec9ed4fe86952763b963c86f0af0dcae69aa6c
Author: Jerome Glisse <jglisse at redhat.com>
Date:   Thu Feb 19 14:47:41 2015 -0500

    Proper leak fix, previous leak fix was bogus.
    
    Signed-off-by: Jérôme Glisse <jglisse at redhat.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 60b1fa0..cebd206 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -576,6 +576,7 @@ done:
 	else
 		crtc->active = TRUE;
 #endif
+	free(output_ids);
 
 	return ret;
 }
@@ -1374,8 +1375,10 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_r
 			drmmode_output = output->driver_private;
 			drmmode_output->output_id = mode_res->connectors[num];
 			drmmode_output->mode_output = koutput;
-			koutput = NULL;
-			goto out_free_encoders;
+			for (i = 0; i < koutput->count_encoders; i++)
+				drmModeFreeEncoder(kencoders[i]);
+			free(kencoders);
+			return;
 		}
 	}