On Thu, Feb 2, 2012 at 3:23 PM, Matthijs Kooijman matthijs@stdin.nl wrote:
This return statement got dropped while fixing the conflicts introduced in 7a7e8734ac3.
drivers/gpu/drm/radeon/evergreen.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Note that I've not actually tested this change, I just noticed when reviewing the mentioned merge commit. If the removal of the return statement was intentional, this patch makes no sense (but sending a patch was the easiest way to point out this bug).
Patch is correct.
Reviewed-by: Alex Deucher alexander.deucher@amd.com
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index ccde2c9..5056a53 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -3190,6 +3190,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);
1.7.7.3
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel