From 28d02b27e3674b3937ce061f32660bd8f4fa3eb8 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Fri, 18 Aug 2006 16:37:10 +1000
Subject: [PATCH] --- yaml --- r: 37513 b: refs/heads/master c:
 1f4eccfdb2a5f8b2751aea8cf2d6b00401c156e0 h: refs/heads/master i:   37511:
 6b35b36edc9d15fa0cb301ab26f120c180ff62d0 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/char/drm/drm_drv.c  | 2 ++
 trunk/drivers/char/drm/drm_fops.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cda15f008704..4376669d9c42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb41e54be4bad6f64d343d051d699efde3c92e2c
+refs/heads/master: 1f4eccfdb2a5f8b2751aea8cf2d6b00401c156e0
diff --git a/trunk/drivers/char/drm/drm_drv.c b/trunk/drivers/char/drm/drm_drv.c
index 654b95cdd9a3..b366c5b1bd16 100644
--- a/trunk/drivers/char/drm/drm_drv.c
+++ b/trunk/drivers/char/drm/drm_drv.c
@@ -161,6 +161,7 @@ int drm_lastclose(drm_device_t * dev)
 			drm_ht_remove_item(&dev->magiclist, &pt->hash_item);
 			drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
 		}
+		drm_ht_remove(&dev->magiclist);
 	}
 
 	/* Clear AGP information */
@@ -299,6 +300,7 @@ static void drm_cleanup(drm_device_t * dev)
 	if (dev->maplist) {
 		drm_free(dev->maplist, sizeof(*dev->maplist), DRM_MEM_MAPS);
 		dev->maplist = NULL;
+		drm_ht_remove(&dev->map_hash);
 	}
 
 	drm_ctxbitmap_cleanup(dev);
diff --git a/trunk/drivers/char/drm/drm_fops.c b/trunk/drivers/char/drm/drm_fops.c
index 2bbf45d85c35..898f47dafec0 100644
--- a/trunk/drivers/char/drm/drm_fops.c
+++ b/trunk/drivers/char/drm/drm_fops.c
@@ -53,6 +53,8 @@ static int drm_setup(drm_device_t * dev)
 			return ret;
 	}
 
+	dev->magicfree.next = NULL;
+
 	/* prebuild the SAREA */
 	i = drm_addmap(dev, 0, SAREA_MAX, _DRM_SHM, _DRM_CONTAINS_LOCK, &map);
 	if (i != 0)