Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196484
b: refs/heads/master
c: 9e51159
h: refs/heads/master
v: v3
  • Loading branch information
Jerome Glisse authored and Dave Airlie committed May 6, 2010
1 parent 51e7a9f commit a5586e3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a1e9ada3e148dc300fdd25705bd3ac024897dc68
refs/heads/master: 9e51159c14c29ebd485a45ba56f148e180d62c29
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/ttm/ttm_bo_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit a5586e3

Please sign in to comment.