diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-01 12:28:42 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-01 12:28:46 +0400 |
| commit | 10e6962765f8213941eaa1cbb9de425ff0689e2e (patch) | |
| tree | c277e4ac5b2b7156152454578c39e90da5127dd8 /drivers/gpu/drm/savage/savage_bci.c | |
| parent | af07ce3e77d3b24ab1d71fcc5833d41800f23b2b (diff) | |
| parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) | |
| download | linux-10e6962765f8213941eaa1cbb9de425ff0689e2e.tar.xz | |
Merge commit 'v3.0-rc5' into perf/core
Merge reason: Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/gpu/drm/savage/savage_bci.c')
| -rw-r--r-- | drivers/gpu/drm/savage/savage_bci.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c index bf5f83ea14fe..cb1ee4e0050a 100644 --- a/drivers/gpu/drm/savage/savage_bci.c +++ b/drivers/gpu/drm/savage/savage_bci.c @@ -647,9 +647,6 @@ int savage_driver_firstopen(struct drm_device *dev) ret = drm_addmap(dev, aperture_base, SAVAGE_APERTURE_SIZE, _DRM_FRAME_BUFFER, _DRM_WRITE_COMBINING, &dev_priv->aperture); - if (ret) - return ret; - return ret; } |