diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2011-07-13 15:18:10 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-07-14 07:15:16 +0100 |
| commit | d0254d56c72532b5d818d83c5e247fc627803f08 (patch) | |
| tree | 60f5bd1c16c1598933a3c7451ccc77b0ff1938c8 /drivers | |
| parent | fcc485d6672952f0ec6d077ea92f703670075323 (diff) | |
| download | linux-stable-d0254d56c72532b5d818d83c5e247fc627803f08.tar.gz linux-stable-d0254d56c72532b5d818d83c5e247fc627803f08.tar.bz2 linux-stable-d0254d56c72532b5d818d83c5e247fc627803f08.zip | |
drm/radeon: Don't clobber error return value in page flipping cleanup paths.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_display.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index ffce85a91165..28f4655905bc 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/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); |