---

yaml --- r: 311027 b: refs/heads/master c: 648ccc7 h: refs/heads/master i: 311025: 8afcbc3 311023: 5013b92 v: v3
git-mirror · Jun 16, 2012 · 808b91f · 808b91f
1 parent 08bec7e
commit 808b91f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce020ea53264f1460ae619cfc12f968dbd0b8974
+refs/heads/master: 648ccc7d35e3416fdc739d2e520e85de3125361b
diff --git a/trunk/drivers/gpu/drm/sis/sis_drv.c b/trunk/drivers/gpu/drm/sis/sis_drv.c
@@ -47,9 +47,9 @@ static int sis_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);
 
 	return 0;
 }