diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/rs600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rs600.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index 25f9eef12c42..e95c5e61d4e2 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c | |||
| @@ -908,12 +908,6 @@ static int rs600_startup(struct radeon_device *rdev) | |||
| 908 | return r; | 908 | return r; |
| 909 | } | 909 | } |
| 910 | 910 | ||
| 911 | r = r600_audio_init(rdev); | ||
| 912 | if (r) { | ||
| 913 | dev_err(rdev->dev, "failed initializing audio\n"); | ||
| 914 | return r; | ||
| 915 | } | ||
| 916 | |||
| 917 | r = radeon_ib_pool_start(rdev); | 911 | r = radeon_ib_pool_start(rdev); |
| 918 | if (r) | 912 | if (r) |
| 919 | return r; | 913 | return r; |
| @@ -922,6 +916,12 @@ static int rs600_startup(struct radeon_device *rdev) | |||
| 922 | if (r) | 916 | if (r) |
| 923 | return r; | 917 | return r; |
| 924 | 918 | ||
| 919 | r = r600_audio_init(rdev); | ||
| 920 | if (r) { | ||
| 921 | dev_err(rdev->dev, "failed initializing audio\n"); | ||
| 922 | return r; | ||
| 923 | } | ||
| 924 | |||
| 925 | return 0; | 925 | return 0; |
| 926 | } | 926 | } |
| 927 | 927 | ||
