summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2007-12-13 10:41:23 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2007-12-13 10:41:23 +0000
commitf62a300547b1f495472f773587cd20c6c9da06aa (patch)
treef113ca2f7d3f5f5926c8b27ea2626f71d941f5c1 /linux-core
parent8d2da202337300e821f4867cb2654b41ff6053b6 (diff)
parent35a8b61317b57fcaaf5f7df06b0e2b532eddb9cb (diff)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_bo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index e912eb21..7a123dad 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -925,7 +925,7 @@ int drm_bo_mem_space(struct drm_buffer_object *bo,
ret = drm_bo_mem_force_space(dev, mem, mem_type, no_wait);
- if (ret == 0) {
+ if (ret == 0 && mem->mm_node) {
mem->flags = cur_flags;
return 0;
}