xf86-video-intel: src/sna/sna_display.c

[Chris Wilson]

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

New commits:
commit 8e7d6ddb9b485045b4662af83e048b06aab358aa
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Oct 13 11:04:02 2013 +0100

    sna: Cleanup allocation of sna_output after late syscall fail
    
    If the second syscall fails (presumably as a deferred allocation failure
    check), cleanup the allocations made so far before reporting the
    failure.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 27a4467..547ebd8 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2594,6 +2594,8 @@ sna_output_init(ScrnInfoPtr scrn, struct sna_mode *mode, int num)
 	sna_output->prop_values = malloc(sizeof(uint64_t)*conn.count_props);
 	sna_output->dpms_mode = DPMSModeOff;
 
+	conn.count_encoders = 0;
+
 	conn.count_modes = 1;
 	conn.modes_ptr = (uintptr_t)&dummy;
 
@@ -2602,7 +2604,7 @@ sna_output_init(ScrnInfoPtr scrn, struct sna_mode *mode, int num)
 	conn.prop_values_ptr = (uintptr_t)sna_output->prop_values;
 
 	if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETCONNECTOR, &conn))
-		return false;
+		goto cleanup;
 
 	/* statically constructed property list */
 	assert(sna_output->num_props == conn.count_props);