From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Thu, 2 Feb 2012 20:23:11 +0000 (+0100)
Subject: drm/radeon: do not continue after error from r600_ib_test
X-Git-Tag: MMI-PSA29.97-13-9~17468^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3fe89a0c799c62de68e9e6d6e33899cd7e0da901;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

drm/radeon: do not continue after error from r600_ib_test

This return statement got dropped while fixing the conflicts introduced
in 7a7e8734ac3.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index ae09fe82afbc..9be353b894cc 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -3191,6 +3191,7 @@ static int evergreen_startup(struct radeon_device *rdev)
 	if (r) {
 		DRM_ERROR("radeon: failed testing IB (%d).\n", r);
 		rdev->accel_working = false;
+		return r;
 	}
 
 	r = r600_audio_init(rdev);