From 68dcdaba48c3e06cb80664d08577cc8923241f5c Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 25 May 2014 05:12:45 +0200 Subject: m + gamma-x-randr: get output and output info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/gamma-linux-drm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/gamma-linux-drm.c') diff --git a/src/gamma-linux-drm.c b/src/gamma-linux-drm.c index 18ebf2b..bdb231c 100644 --- a/src/gamma-linux-drm.c +++ b/src/gamma-linux-drm.c @@ -608,7 +608,10 @@ static int get_edid(libgamma_crtc_state_t* restrict crtc, { blob = drmModeGetPropertyBlob(card->fd, (uint32_t)(connector->prop_values[prop_i])); if (blob == NULL) - goto fail_blob; + { + drmModeFreeProperty(prop); + return out->edid_error = LIBGAMMA_PROPERTY_VALUE_QUERY_FAILED; + } if (blob->data != NULL) { out->edid_length = blob->length; @@ -622,11 +625,9 @@ static int get_edid(libgamma_crtc_state_t* restrict crtc, } drmModeFreePropertyBlob(blob); } - fail_blob: drmModeFreeProperty(prop); } - out->edid_error = LIBGAMMA_EDID_NOT_FOUND; - return -1; + return out->edid_error = LIBGAMMA_EDID_NOT_FOUND; } -- cgit v1.2.3-70-g09d2