summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2008-11-06 18:23:21 -0500
committerKristian Høgsberg <krh@redhat.com>2008-11-06 18:23:21 -0500
commit64107309e212a0ead3da229d749f26301cab0113 (patch)
treef94869b337bb286a8b270f866e55d7607048cd15
parent062efc5b5fcd14603f308b8effa7a7261d2ca561 (diff)
Fix bogus error path.
-rw-r--r--intel.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/intel.c b/intel.c
index 20fb503..c946fad 100644
--- a/intel.c
+++ b/intel.c
@@ -148,7 +148,6 @@ nativeInitDRICopyBuffer(EGLDisplay display)
drmModeCrtcPtr crtc;
drmModeFBPtr fb;
struct drm_gem_flink flink;
- struct driPrivate *private;
int i;
extensions = display->core->getExtensions(display->driScreen);
@@ -164,30 +163,30 @@ nativeInitDRICopyBuffer(EGLDisplay display)
}
if (nativeDisplay->copyBuffer == NULL)
- goto fail;
+ return;
mode_res = drmModeGetResources(display->fd);
if (mode_res == NULL) {
fprintf(stderr, "drmModeGetResources returns NULL\n");
- goto fail;
+ return;
}
crtc = drmModeGetCrtc(display->fd, mode_res->crtcs[1]);
if (crtc == NULL) {
fprintf(stderr, "drmModeGetCrtc returns NULL\n");
- goto fail;
+ return;
}
fb = drmModeGetFB(display->fd, crtc->buffer_id);
if (fb == NULL) {
fprintf(stderr, "drmModeGetFB returns NULL\n");
- goto fail;
+ return;
}
flink.handle = fb->handle;
if (ioctl(display->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) {
fprintf(stderr, "failed to create buffer\n");
- goto fail;
+ return;
}
nativeDisplay->front.attachment = __DRI_BUFFER_FRONT_LEFT;
@@ -201,11 +200,6 @@ nativeInitDRICopyBuffer(EGLDisplay display)
display->backend = &nativeDRIBackend;
printf("Using DRI CopyBuffer swapbuffer\n");
-
- return;
-
- fail:
- free(private);
}
#endif