xf86-video-ati: Branch 'master'

[Jerome Glisse]

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

New commits:
commit 63dc36dc49f93cb00111b497ab6805194bc9d240
Author: Jerome Glisse <jglisse at redhat.com>
Date:   Thu Feb 19 11:43:08 2015 -0500

    Avoid leaking memory on output.
    
    Signed-off-by: Jérôme Glisse <jglisse at redhat.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 40afb49..60b1fa0 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1374,7 +1374,8 @@ 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;
-			return;
+			koutput = NULL;
+			goto out_free_encoders;
 		}
 	}