---

yaml --- r: 190571 b: refs/heads/master c: ccb2ad5 h: refs/heads/master i: 190569: 15021cd 190567: 74ce625 v: v3
git-mirror · Apr 28, 2010 · 298ebce · 298ebce
1 parent ed6bcbd
commit 298ebce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 797fd5b9dad12a100c81b5782573a41259728cb1
+refs/heads/master: ccb2ad579f910e6146adf4eb3aa50325253ee8c9
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_agp.c b/trunk/drivers/gpu/drm/radeon/radeon_agp.c
@@ -134,12 +134,10 @@ int radeon_agp_init(struct radeon_device *rdev)
 	int ret;
 
 	/* Acquire AGP. */
-	if (!rdev->ddev->agp->acquired) {
-		ret = drm_agp_acquire(rdev->ddev);
-		if (ret) {
-			DRM_ERROR("Unable to acquire AGP: %d\n", ret);
-			return ret;
-		}
+	ret = drm_agp_acquire(rdev->ddev);
+	if (ret) {
+		DRM_ERROR("Unable to acquire AGP: %d\n", ret);
+		return ret;
 	}
 
 	ret = drm_agp_info(rdev->ddev, &info);