diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-06-22 16:19:07 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-06-23 16:09:54 +0900 |
| commit | 3bce0519a4008cf87c0e31a7a579e10f5dcdd2f3 (patch) | |
| tree | a6a88d87f8bd075bdde04b0f0fc4f522659db809 | |
| parent | a3ca1500703837cbb8d49c554199a25dea7d5e1e (diff) | |
Simplify drmmode_set_mode_major error handling
Initialize ret = FALSE and only set it to TRUE when we've succeeded.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | src/drmmode_display.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 8d8eeb1..50e541e 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -650,7 +650,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, DisplayModeRec saved_mode; uint32_t *output_ids = NULL; int output_count = 0; - Bool ret = TRUE; + Bool ret = FALSE; int i; int fb_id; drmModeModeInfo kmode; @@ -668,10 +668,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, crtc->rotation = rotation; output_ids = calloc(sizeof(uint32_t), xf86_config->num_output); - if (!output_ids) { - ret = FALSE; + if (!output_ids) goto done; - } for (i = 0; i < xf86_config->num_output; i++) { xf86OutputPtr output = xf86_config->output[i]; @@ -768,7 +766,6 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, if (fb_id == 0) { if (!amdgpu_bo_get_handle(info->front_buffer, &bo_handle)) { ErrorF("failed to get BO handle for FB\n"); - ret = FALSE; goto done; } @@ -779,7 +776,6 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, pScrn->displayWidth * info->pixel_bytes, bo_handle, &drmmode->fb_id) < 0) { ErrorF("failed to add fb\n"); - ret = FALSE; goto done; } @@ -797,7 +793,6 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, output_count, &kmode) != 0) { xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR, "failed to set mode: %s\n", strerror(errno)); - ret = FALSE; goto done; } else ret = TRUE; |