diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-12 05:46:58 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-12 05:46:58 +0200 |
| commit | 66e61060d7ad9fcf61475fb836fb5987db7a7ee0 (patch) | |
| tree | a0abe3fb2fa8858261dc41df9444c0e0ca85f1a6 /drivers/gpu/drm/radeon/rs600.c | |
| parent | ASoC: wm8903: Move register default changes to I2C probe (diff) | |
| parent | mfd/ab8500: Move platform-data for ab8500-codec into mfd-driver (diff) | |
| download | linux-66e61060d7ad9fcf61475fb836fb5987db7a7ee0.tar.xz linux-66e61060d7ad9fcf61475fb836fb5987db7a7ee0.zip | |
Merge branch 'asoc-ab8500' into for-3.6
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) return r; } - r = r600_audio_init(rdev); - if (r) { - dev_err(rdev->dev, "failed initializing audio\n"); - return r; - } - r = radeon_ib_pool_start(rdev); if (r) return r; @@ -922,6 +916,12 @@ static int rs600_startup(struct radeon_device *rdev) if (r) return r; + r = r600_audio_init(rdev); + if (r) { + dev_err(rdev->dev, "failed initializing audio\n"); + return r; + } + return 0; } |