---

yaml --- r: 205009 b: refs/heads/master c: 37f9003 h: refs/heads/master i: 205007: 17f8fac v: v3
git-mirror · Jul 21, 2010 · 8e47e83 · 8e47e83
1 parent 0a96bfb
commit 8e47e83
Show file tree

Hide file tree

Showing 38 changed files with 774 additions and 1,192 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e190bfe56841551b1ad5abb42ebd0c4798cc8c01
+refs/heads/master: 37f9003bd355d9109769fff66f7f228aab42155b
diff --git a/trunk/drivers/gpu/drm/drm_drv.c b/trunk/drivers/gpu/drm/drm_drv.c
@@ -335,7 +335,6 @@ static void __exit drm_core_exit(void)
 
 	unregister_chrdev(DRM_MAJOR, "drm");
 
-	idr_remove_all(&drm_minors_idr);
 	idr_destroy(&drm_minors_idr);
 }
 

diff --git a/trunk/drivers/gpu/drm/drm_gem.c b/trunk/drivers/gpu/drm/drm_gem.c
@@ -429,7 +429,6 @@ drm_gem_release(struct drm_device *dev, struct drm_file *file_private)
 	idr_for_each(&file_private->object_idr,
 		     &drm_gem_object_release_handle, NULL);
 
-	idr_remove_all(&file_private->object_idr);
 	idr_destroy(&file_private->object_idr);
 }
 

diff --git a/trunk/drivers/gpu/drm/drm_stub.c b/trunk/drivers/gpu/drm/drm_stub.c
@@ -156,9 +156,6 @@ static void drm_master_destroy(struct kref *kref)
 		master->unique_len = 0;
 	}
 
-	kfree(dev->devname);
-	dev->devname = NULL;
-
 	list_for_each_entry_safe(pt, next, &master->magicfree, head) {
 		list_del(&pt->head);
 		drm_ht_remove_item(&master->magiclist, &pt->hash_item);

diff --git a/trunk/drivers/gpu/drm/i2c/Makefile b/trunk/drivers/gpu/drm/i2c/Makefile
@@ -2,6 +2,3 @@ ccflags-y := -Iinclude/drm
 
 ch7006-y := ch7006_drv.o ch7006_mode.o
 obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
-
-sil164-y := sil164_drv.o
-obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o
-Original file line number
+Diff line change
@@ Expand Up / @@ -335,7 +335,6 @@ static void __exit drm_core_exit(void) @@
     	unregister_chrdev(DRM_MAJOR, "drm");
-    	idr_remove_all(&drm_minors_idr);
     	idr_destroy(&drm_minors_idr);
     }
@@ Expand Down @@