diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-28 14:48:58 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-28 14:48:58 -0500 |
| commit | b3950d50cfc343b3e7dc5c69c96a61b182fd1e37 (patch) | |
| tree | d54affae2b1e25464493b48aa88cd8d6b4770812 /drivers/gpu/drm/radeon/evergreen.c | |
| parent | daefd89efc279b142bbb054577c2d706da211723 (diff) | |
| parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
Merge branch 'irqdomain/next' into gpio/next
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) | |||
| 3191 | if (r) { | 3191 | if (r) { |
| 3192 | DRM_ERROR("radeon: failed testing IB (%d).\n", r); | 3192 | DRM_ERROR("radeon: failed testing IB (%d).\n", r); |
| 3193 | rdev->accel_working = false; | 3193 | rdev->accel_working = false; |
| 3194 | return r; | ||
| 3194 | } | 3195 | } |
| 3195 | 3196 | ||
| 3196 | r = r600_audio_init(rdev); | 3197 | r = r600_audio_init(rdev); |