From 82f8344094124867e2bb98e02195c96cc8453305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 13 Jul 2011 15:18:10 +0000 Subject: [PATCH] --- yaml --- r: 260211 b: refs/heads/master c: d0254d56c72532b5d818d83c5e247fc627803f08 h: refs/heads/master i: 260209: 10a906613131154c810a20dea6665892611c32de 260207: 5bcebc3be6d6279bd22a4c64dada8cdaa3a0dbc6 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_display.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index cddda0f1a35e..7036de4485d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fcc485d6672952f0ec6d077ea92f703670075323 +refs/heads/master: d0254d56c72532b5d818d83c5e247fc627803f08 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_display.c b/trunk/drivers/gpu/drm/radeon/radeon_display.c index ffce85a91165..28f4655905bc 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_display.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_display.c @@ -460,17 +460,12 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc, return 0; pflip_cleanup1: - r = radeon_bo_reserve(rbo, false); - if (unlikely(r != 0)) { + if (unlikely(radeon_bo_reserve(rbo, false) != 0)) { DRM_ERROR("failed to reserve new rbo in error path\n"); goto pflip_cleanup; } - r = radeon_bo_unpin(rbo); - if (unlikely(r != 0)) { - radeon_bo_unreserve(rbo); - r = -EINVAL; + if (unlikely(radeon_bo_unpin(rbo) != 0)) { DRM_ERROR("failed to unpin new rbo in error path\n"); - goto pflip_cleanup; } radeon_bo_unreserve(rbo);