---

yaml --- r: 311026 b: refs/heads/master c: ce020ea h: refs/heads/master v: v3
git-mirror · Jun 16, 2012 · 08bec7e · 08bec7e
1 parent 8afcbc3
commit 08bec7e
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: 489797d510dfbce15120492d7ef6f956928b99f2
+refs/heads/master: ce020ea53264f1460ae619cfc12f968dbd0b8974
diff --git a/trunk/drivers/gpu/drm/via/via_map.c b/trunk/drivers/gpu/drm/via/via_map.c
@@ -100,12 +100,11 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset)
 	if (dev_priv == NULL)
 		return -ENOMEM;
 
+	idr_init(&dev_priv->object_idr);
 	dev->dev_private = (void *)dev_priv;
 
 	dev_priv->chipset = chipset;
 
-	idr_init(&dev->object_name_idr);
-
 	pci_set_master(dev->pdev);
 
 	ret = drm_vblank_init(dev, 1);