From a5586e315b14714120f03de81bd91db5e3fea695 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jglisse@redhat.com>
Date: Wed, 5 May 2010 11:02:44 +0200
Subject: [PATCH] --- yaml --- r: 196484 b: refs/heads/master c:
 9e51159c14c29ebd485a45ba56f148e180d62c29 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c8bf51ab3e20..6f46bf38aaa7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1e9ada3e148dc300fdd25705bd3ac024897dc68
+refs/heads/master: 9e51159c14c29ebd485a45ba56f148e180d62c29
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo_util.c b/trunk/drivers/gpu/drm/ttm/ttm_bo_util.c
index a37a94872a14..13012a1f1486 100644
--- a/trunk/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/trunk/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -113,7 +113,7 @@ int ttm_mem_reg_ioremap(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem,
 
 	*virtual = NULL;
 	ret = ttm_mem_io_reserve(bdev, mem);
-	if (ret)
+	if (ret || !mem->bus.is_iomem)
 		return ret;
 
 	if (mem->bus.addr) {