2011/7/12 Michel Dänzer <michel@xxxxxxxxxxx>: > From: Michel Dänzer <michel.daenzer@xxxxxxx> > > Signed-off-by: Michel Dänzer <michel.daenzer@xxxxxxx> Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > 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 71a4840..c2d8d25 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -458,17 +458,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); > > -- > 1.7.5.4 > > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/dri-devel > _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel