Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0254d56 authored by Michel Dänzer's avatar Michel Dänzer Committed by Dave Airlie
Browse files

drm/radeon: Don't clobber error return value in page flipping cleanup paths. 



Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent fcc485d6

drivers/gpu/drm/radeon/radeon_display.c

+2 −7
Original line number Diff line number Diff line
@@ -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);