---

yaml --- r: 145487 b: refs/heads/master c: 6c51d1c h: refs/heads/master i: 145485: 381eba9 145483: 62c3b9d 145479: 3be2615 145471: f826d57 v: v3
git-mirror · Jun 3, 2009 · 8b0d271 · 8b0d271
1 parent d275913
commit 8b0d271
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93c05f222413e3a16e8785f252db4726693abd71
+refs/heads/master: 6c51d1cfa0a370b48a157163340190cf5fd2346b
diff --git a/trunk/drivers/gpu/drm/drm_bufs.c b/trunk/drivers/gpu/drm/drm_bufs.c
@@ -371,7 +371,8 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
 	list->user_token = list->hash.key << PAGE_SHIFT;
 	mutex_unlock(&dev->struct_mutex);
 
-	list->master = dev->primary->master;
+	if (!(map->flags & _DRM_DRIVER))
+		list->master = dev->primary->master;
 	*maplist = list;
 	return 0;
 	}