---

yaml --- r: 145496 b: refs/heads/master c: 27704a1 h: refs/heads/master v: v3
git-mirror · Jun 5, 2009 · 8100f6d · 8100f6d
1 parent 4cb574a
commit 8100f6d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9e10124e269a39de089c5e0d9936fae2ff889b2
+refs/heads/master: 27704a16c9e0fb4c6b04344c7c4c40ac16148ec0
diff --git a/trunk/drivers/gpu/drm/drm_bufs.c b/trunk/drivers/gpu/drm/drm_bufs.c
@@ -371,8 +371,7 @@ 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);
 
-	if (!(map->flags & _DRM_DRIVER))
-		list->master = dev->primary->master;
+	list->master = dev->primary->master;
 	*maplist = list;
 	return 0;
 	}