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) {