From f530f2f60226d480a8bf43c04437c2d01c2a6613 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Mon, 16 Mar 2009 15:37:02 -0400
Subject: [PATCH] --- yaml --- r: 138985 b: refs/heads/master c:
 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5 h: refs/heads/master i:   138983:
 84ce1b1c51b299a9394f6359b3090196191eb48e v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/gpu/drm/radeon/r600_cp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7ac9ba5ed380..f91f5f07236b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06f0a488c1b642d3cd7769da66600e5148c3fad8
+refs/heads/master: 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5
diff --git a/trunk/drivers/gpu/drm/radeon/r600_cp.c b/trunk/drivers/gpu/drm/radeon/r600_cp.c
index 76eb0d5ab570..9d14eee3ed09 100644
--- a/trunk/drivers/gpu/drm/radeon/r600_cp.c
+++ b/trunk/drivers/gpu/drm/radeon/r600_cp.c
@@ -172,7 +172,6 @@ int r600_page_table_init(struct drm_device *dev)
 		if (entry->busaddr[i] == 0) {
 			DRM_ERROR("unable to map PCIGART pages!\n");
 			r600_page_table_cleanup(dev, gart_info);
-			ret = -EINVAL;
 			goto done;
 		}
 		entry_addr = entry->busaddr[i];
@@ -191,6 +190,7 @@ int r600_page_table_init(struct drm_device *dev)
 			entry_addr += ATI_PCIGART_PAGE_SIZE;
 		}
 	}
+	ret = 1;
 done:
 	return ret;
 }
@@ -2095,7 +2095,7 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
 			  dev_priv->gart_info.addr,
 			  dev_priv->pcigart_offset);
 
-		if (r600_page_table_init(dev)) {
+		if (!r600_page_table_init(dev)) {
 			DRM_ERROR("Failed to init GART table\n");
 			r600_do_cleanup_cp(dev);
 			return -EINVAL;